From db0629df8290a52e152571c9b160b4b8c04d688d Mon Sep 17 00:00:00 2001 From: bragelbytes Date: Wed, 24 Jan 2024 18:48:17 -0800 Subject: [PATCH] gradle update and added context --- app/build.gradle | 4 ++-- build.gradle | 2 +- moonbounceVPNService/build.gradle | 6 +++--- .../moonbouncevpnservice/MBAKVpnService.kt | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 065597a..f2afecb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,12 +4,12 @@ plugins { } android { - compileSdk 34 + compileSdk 33 defaultConfig { namespace = "org.operatorfoundation.moonbounceAndroidKotlin" applicationId "org.operatorfoundation.moonbounceAndroidKotlin" - minSdk 29 + minSdk 26 targetSdk 33 versionCode 1 versionName "1.0" diff --git a/build.gradle b/build.gradle index 5c7ea81..4ee616a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins{ - id 'com.android.library' version '8.1.2' apply false + id 'com.android.library' version '8.2.1' apply false id 'org.jetbrains.kotlin.android' version '1.9.0' apply false } diff --git a/moonbounceVPNService/build.gradle b/moonbounceVPNService/build.gradle index f36337d..207129f 100644 --- a/moonbounceVPNService/build.gradle +++ b/moonbounceVPNService/build.gradle @@ -4,7 +4,7 @@ plugins { } android { - compileSdk 34 + compileSdk 33 namespace = "org.operatorfoundation.moonbouncevpnservice" defaultConfig { @@ -33,8 +33,8 @@ android { dependencies { implementation 'androidx.core:core-ktx:1.10.1' - implementation 'com.github.OperatorFoundation:TransmissionAndroid:1.3.2' - implementation 'com.github.OperatorFoundation:ShapeshifterAndroidKotlin:4.1.4' + implementation 'com.github.OperatorFoundation:transmissionandroid:1.3.3' + implementation 'com.github.OperatorFoundation:ShapeshifterAndroidKotlin:5.0.4' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' diff --git a/moonbounceVPNService/src/main/java/org/operatorfoundation/moonbouncevpnservice/MBAKVpnService.kt b/moonbounceVPNService/src/main/java/org/operatorfoundation/moonbouncevpnservice/MBAKVpnService.kt index 0c9727e..6fe7b95 100644 --- a/moonbounceVPNService/src/main/java/org/operatorfoundation/moonbouncevpnservice/MBAKVpnService.kt +++ b/moonbounceVPNService/src/main/java/org/operatorfoundation/moonbouncevpnservice/MBAKVpnService.kt @@ -139,7 +139,8 @@ class MBAKVpnService : VpnService() { val serverAddress = "$transportServerIP:$transportServerPort" val config = ShadowConfig(transportServerPublicKey!!, "Darkstar", serverAddress) - this.shadowConnection = ShadowConnection(config, Logger.getLogger("MoonbounceShadowLogger"), this.transmissionConnection!!) + val context = applicationContext + this.shadowConnection = ShadowConnection(config, context, Logger.getLogger("MoonbounceShadowLogger"), this.transmissionConnection!!) } // println("🌙 MBAKVpnService: starting ServerToVPN loop")