diff options
-rw-r--r-- | gradle/libs.versions.toml | 15 | ||||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 | ||||
-rw-r--r-- | main/build.gradle.kts | 8 | ||||
-rw-r--r-- | main/src/ui/java/de/blinkt/openvpn/activities/InternalWebView.kt | 2 |
4 files changed, 17 insertions, 12 deletions
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a9c675c5..eafb4d84 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,14 +1,15 @@ [versions] -android-gradle-plugin = "8.3.2" -androidx-annotation = "1.8.0" +android-gradle-plugin = "8.5.1" +androidx-activity = "1.9.1" +androidx-annotation = "1.8.1" androidx-appcompat = "1.7.0" android-view-material = "1.12.0" androidx-core-ktx = "1.13.1" -androidx-fragment-ktx = "1.8.1" +androidx-fragment-ktx = "1.8.2" androidx-preference-ktx = "1.2.1" androidx-webkit = "1.11.0" -androidx-lifecycle-viewmodel-ktx = "2.8.3" -androidx-lifecycle-runtime-ktx = "2.8.3" +androidx-lifecycle-viewmodel-ktx = "2.8.4" +androidx-lifecycle-runtime-ktx = "2.8.4" androidx-security-crypto = "1.1.0-alpha06" androidx-constraintlayout = "2.1.4" androidx-cardview = "1.0.0" @@ -16,7 +17,7 @@ androidx-recyclerview = "1.3.2" androidx-viewpager2 = "1.1.0" bouncycastle = "1.69" mpandroidchart = "v3.1.0" -kotlin = "1.9.20" +kotlin = "1.9.22" square-okhttp = "4.10.0" # Test @@ -28,6 +29,8 @@ robolectric = "4.10.2" [libraries] android-view-material = { group = "com.google.android.material", name = "material", version.ref = "android-view-material" } androidx-annotation = { group = "androidx.annotation", name = "annotation", version.ref = "androidx-annotation" } +androidx-activity = { group = "androidx.activity", name = "activity", version.ref = "androidx-activity"} +androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "androidx-activity"} androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" } androidx-cardview = { group = "androidx.cardview", name = "cardview", version.ref = "androidx-cardview" } androidx-viewpager2 = { group = "androidx.viewpager2", name = "viewpager2", version.ref= "androidx-viewpager2" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e59ea7ea..618ee5cc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jun 03 01:41:27 CEST 2020 +#Tue Jul 23 16:10:00 CEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip diff --git a/main/build.gradle.kts b/main/build.gradle.kts index 20dc6479..a52cf835 100644 --- a/main/build.gradle.kts +++ b/main/build.gradle.kts @@ -16,15 +16,15 @@ android { aidl = true } namespace = "de.blinkt.openvpn" - compileSdk = 34 + compileSdk = 35 //compileSdkPreview = "UpsideDownCake" // Also update runcoverity.sh - ndkVersion = "26.1.10909125" + ndkVersion = "26.3.11579264" defaultConfig { minSdk = 21 - targetSdk = 34 + targetSdk = 35 //targetSdkPreview = "UpsideDownCake" versionCode = 206 versionName = "0.7.51" @@ -235,6 +235,8 @@ dependencies { implementation(libs.androidx.core.ktx) uiImplementation(libs.android.view.material) + uiImplementation(libs.androidx.activity) + uiImplementation(libs.androidx.activity.ktx) uiImplementation(libs.androidx.appcompat) uiImplementation(libs.androidx.cardview) uiImplementation(libs.androidx.viewpager2) diff --git a/main/src/ui/java/de/blinkt/openvpn/activities/InternalWebView.kt b/main/src/ui/java/de/blinkt/openvpn/activities/InternalWebView.kt index 1a16829e..e46356e9 100644 --- a/main/src/ui/java/de/blinkt/openvpn/activities/InternalWebView.kt +++ b/main/src/ui/java/de/blinkt/openvpn/activities/InternalWebView.kt @@ -94,7 +94,7 @@ class InternalWebView : AppCompatActivity() { } - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) } |