diff --git a/.circleci/config.yml b/.circleci/config.yml index 26f3c264..445bcea1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ jobs: build: working_directory: ~/code docker: - - image: cimg/android:2023.04.1 + - image: cimg/android:2023.05.1 environment: GRADLE_OPTS: -Dorg.gradle.workers.max=1 -Dorg.gradle.daemon=false -Dkotlin.compiler.execution.strategy="in-process" steps: diff --git a/build.gradle.kts b/build.gradle.kts index 63f607e8..d159c9bb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { - id("com.android.application") version "8.1.0-alpha11" apply false + id("com.android.application") version "8.2.0-alpha04" apply false id("com.github.ben-manes.versions") version "0.46.0" - id("org.jetbrains.kotlin.android") version "1.8.20" apply false + id("org.jetbrains.kotlin.android") version "1.8.21" apply false } buildscript { diff --git a/gradle.properties b/gradle.properties index fc6ef1a8..ddd4d184 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,6 +12,7 @@ android.enableJetifier=true android.enableR8.fullMode=true android.enableResourceOptimizations=false +android.enableVcsInfo=true android.injected.testOnly=false android.nonTransitiveRClass=true android.useAndroidX=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbf..ccebba77 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bdc9a83b..37aef8d3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68d..79a61d42 100755 --- a/gradlew +++ b/gradlew @@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts index eacfcc97..127b1bcd 100644 --- a/mobile/build.gradle.kts +++ b/mobile/build.gradle.kts @@ -12,7 +12,7 @@ android { namespace = "be.mygod.vpnhotspot" val javaVersion = 11 - buildToolsVersion = "34.0.0-rc2" + buildToolsVersion = "34.0.0-rc4" compileOptions { isCoreLibraryDesugaringEnabled = true sourceCompatibility(javaVersion) @@ -79,27 +79,27 @@ dependencies { kapt("androidx.room:room-compiler:$roomVersion") implementation(kotlin("stdlib-jdk8")) implementation("androidx.browser:browser:1.5.0") - implementation("androidx.core:core-ktx:1.10.0") - implementation("androidx.fragment:fragment-ktx:1.5.6") + implementation("androidx.core:core-ktx:1.10.1") + implementation("androidx.fragment:fragment-ktx:1.6.0-rc01") implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion") implementation("androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion") implementation("androidx.preference:preference:1.2.0") implementation("androidx.room:room-ktx:$roomVersion") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") - implementation("be.mygod.librootkotlinx:librootkotlinx:1.0.2") - implementation("com.android.billingclient:billing-ktx:5.2.0") + implementation("be.mygod.librootkotlinx:librootkotlinx:1.0.4") + implementation("com.android.billingclient:billing-ktx:6.0.0") implementation("com.github.tiann:FreeReflection:3.1.0") implementation("com.google.android.gms:play-services-base:18.2.0") // fix for GoogleApiActivity crash @ 18.1.0+ - implementation("com.google.android.gms:play-services-oss-licenses:17.0.0") - implementation("com.google.android.material:material:1.10.0-alpha01") + implementation("com.google.android.gms:play-services-oss-licenses:17.0.1") + implementation("com.google.android.material:material:1.10.0-alpha03") implementation("com.google.firebase:firebase-analytics-ktx:21.2.2") - implementation("com.google.firebase:firebase-crashlytics:18.3.6") + implementation("com.google.firebase:firebase-crashlytics:18.3.7") implementation("com.google.zxing:core:3.5.1") implementation("com.jakewharton.timber:timber:5.0.1") implementation("com.linkedin.dexmaker:dexmaker:2.28.3") implementation("com.takisoft.preferencex:preferencex-simplemenu:1.1.0") implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.5") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.0-Beta") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1") add("googleImplementation", "com.google.android.play:core:1.10.3") add("googleImplementation", "com.google.android.play:core-ktx:1.8.1") testImplementation("junit:junit:4.13.2") diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/util/Utils.kt b/mobile/src/main/java/be/mygod/vpnhotspot/util/Utils.kt index cb67f2bd..c4ce299f 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/util/Utils.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/util/Utils.kt @@ -261,8 +261,8 @@ private val engine by lazy @TargetApi(34) { setEnableHttpCache(HttpEngine.Builder.HTTP_CACHE_DISK, 1024 * 1024) } setConnectionMigrationOptions(ConnectionMigrationOptions.Builder().apply { - setEnableDefaultNetworkMigration(true) - setEnablePathDegradationMigration(true) + setDefaultNetworkMigration(ConnectionMigrationOptions.MIGRATION_OPTION_ENABLED) + setPathDegradationMigration(ConnectionMigrationOptions.MIGRATION_OPTION_ENABLED) }.build()) setEnableBrotli(true) addQuicHint(MacLookup.HOST, 443, 443)