update IPtProxy version

guardianproject · Oct 17, 2022 · de76076 · de76076
1 parent 0064a67
commit de76076
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -68,14 +68,15 @@ android {
                 libs.androidx_localbroadcast,
                 libs.apl_appintro,
                 libs.bclogic_pulsator,
-                libs.ipt_proxy
+           //     libs.ipt_proxy
         )
         androidTestImplementation libs.fastlane_screengrab
         coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 
         //building from AAR built from https://github.com/guardianproject/tor-android/commit/95eca2a8c9eb44068f11332d7731580a13ef7b28
         //    until a new full release is done
        implementation files('../libs/tor-android-binary-release.aar')
+        implementation files('../libs/OrbotLib.aar')
 
     }
 }
diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         maven { url 'https://jitpack.io' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.4'
+        classpath 'com.android.tools.build:gradle:7.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -20,7 +20,7 @@ ext {
             fastlane_screengrab          : "1.2.0",
             guardian_jsocks              : "1.0.4",
             guardian_jtorctl             : "0.4.5.7",
-            ipt_proxy                    : "1.7.1",
+            ipt_proxy                    : "1.8.1",
             portmapper                   : "2.0.5",
             tor_android                  : "0.4.7.8",
             pcap_core                    : "1.8.2",
@@ -49,7 +49,8 @@ ext {
             fastlane_screengrab            : "tools.fastlane:screengrab:$versions.fastlane_screengrab",
             guardian_jsocks                : "com.gitlab.guardianproject:jsocksandroid:$versions.guardian_jsocks",
             guardian_jtorctl               : "info.guardianproject:jtorctl:$versions.guardian_jtorctl",
-            ipt_proxy                      : "com.github.bitmold:OrbotIPtProxy:$versions.ipt_proxy",
+      //      ipt_proxy                      : "com.github.bitmold:OrbotIPtProxy:$versions.ipt_proxy",
+            ipt_proxy                      : "com.github.tladesignz:IPtProxy:$versions.ipt_proxy",
             portmapper                     : "com.offbynull.portmapper:portmapper:$versions.portmapper",
             tor_android                    : "info.guardianproject:tor-android:$versions.tor_android",
             pcap_core                      : "org.pcap4j:pcap4j-core:$versions.pcap_core",

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 distributionSha256Sum=9bb8bc05f562f2d42bdf1ba8db62f6b6fa1c3bf6c392228802cc7cb0578fe7e0
-distributionUrl=https://services.gradle.org/distributions/gradle-7.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle
@@ -46,7 +46,7 @@ dependencies {
             libs.android_shell,
             libs.androidx_core,
             libs.androidx_localbroadcast,
-            libs.ipt_proxy,
+   //         libs.ipt_proxy,
             libs.guardian_jsocks,
             libs.portmapper,
       //      libs.tor_android,
@@ -59,5 +59,6 @@ dependencies {
     //implementation files('../libs/i.aar')
     implementation files('../libs/tor-android-binary-release.aar')
     implementation files('../libs/geoip.jar')
+    implementation files('../libs/OrbotLib.aar')
 
 }
diff --git a/settings.gradle b/settings.gradle
@@ -11,4 +11,12 @@ dependencyResolutionManagement {
             from(files("./gradle/libs.versions.toml"))
         }
     }
+}**/
+/**
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        // ...
+        maven { url 'https://jitpack.io' }
+    }
 }**/