Update tools and deps (#191)

* upgrade gradle and AGP
* update dependencies
* prevent 3rd party PR hook failure
* remove unneeded stuff from catalog

.github/workflows/mattermost-ziti-webhook.yml

@@ -16,17 +16,19 @@ jobs:
   ziti-webhook:
     runs-on: ubuntu-latest
     name: Ziti Mattermost Webhook
+    env:
+      ZHOOK: ${{ secrets.ZHOOK_URL }}
     steps:
     - uses: openziti/ziti-mattermost-action-py@main
-      if: github.event_name != 'pull_request_review'
+      if: env.ZHOOK && github.event_name != 'pull_request_review'
       with:
         zitiId: ${{ secrets.ZITI_MATTERMOST_IDENTITY }}
         webhookUrl: ${{ secrets.ZHOOK_URL }}
         eventJson: ${{ toJson(github.event) }}
         senderUsername: "GitHubZ"
         destChannel: "dev-notifications"
     - uses: openziti/ziti-mattermost-action-py@main
-      if: github.event_name == 'pull_request_review' && github.event.review.state == 'approved'
+      if: env.ZHOOK && github.event_name == 'pull_request_review' && github.event.review.state == 'approved'
       with:
         zitiId: ${{ secrets.ZITI_MATTERMOST_IDENTITY }}
         webhookUrl: ${{ secrets.ZHOOK_URL }}

app/build.gradle

@@ -22,13 +22,12 @@ android {
             storePassword System.getenv('RELEASE_KEYSTORE_PASSWORD')
         }
     }
-    compileSdk = 33
-    ndkVersion "22.1.7171670"
+
+    compileSdk = 34
 
     defaultConfig {
         applicationId "org.openziti.mobile"
         minSdkVersion 26
-        targetSdkVersion 33
         versionCode vc
         versionName "${project.version}"
 
@@ -50,7 +49,7 @@ android {
         }
     }
 
-    lintOptions {
+    lint {
         // Or, if you prefer, you can continue to check for errors in release builds,
         // but continue the build even when errors are found:
         abortOnError false

build.gradle

@@ -13,6 +13,9 @@ buildscript {
                 ziti: '0.23.11'
         ]
     }
+    dependencies {
+//        classpath libs.kotlin.gradle.plugin
+    }
 }
 
 def getVersionCode = { ->
@@ -79,13 +82,6 @@ ext.gitHash = getCommitHash()
 ext.gitBranch = getBranchName()
 ext.versionCode = getVersionCode()
 
-subprojects {
-    repositories {
-        mavenCentral()
-        google()
-    }
-}
-
 tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

gradle/libs.versions.toml

@@ -1,35 +1,30 @@
 [versions]
 # plugins
-android = "8.1.0"
-kotlin = "1.9.0"
-dokka = "1.8.20"
-nexus = "1.3.0"
-semver-git = "2.3.7"
+android = "8.5.1"
+kotlin = "1.9.22"
 
 # 3rd part deps
 slf4j-android = "2.0.7-0"
-appcompat = "1.6.1"
+appcompat = "1.7.0"
 constraintlayout = "2.1.4"
 lifecycle-extensions = "2.2.0"
-material = "1.9.0"
+material = "1.12.0"
 pcap4j = "1.8.2"
-lifecycle = "2.6.1"
+lifecycle = "2.8.3"
 coroutines = "1.7.3"
-core-ktx = "1.10.1"
-lazysodium-android = "5.1.0"
 jna = "5.13.0"
-retrofit = "2.9.0"
 zxing-android-embedded = "4.3.0"
 
 # ziti
-ziti-core = "0.25.1"
 ziti-android = "0.30.0"
 
 # test deps
 hamcrest-core = "2.2"
 junit = "4.13.2"
-test = "1.5.0"
-espresso-core = "3.5.1"
+test = "1.6.1"
+espresso-core = "3.6.1"
+core-ktx-version = "1.13.1"
+junit-version = "1.2.1"
 
 [libraries]
 slf4j-android = { module = "uk.uuid.slf4j:slf4j-android", version.ref = "slf4j-android" }
@@ -42,7 +37,6 @@ lifecycle-extensions = { module = "androidx.lifecycle:lifecycle-extensions", ver
 material = { module = "com.google.android.material:material", version.ref = "material" }
 pcap4j-core = { module = "org.pcap4j:pcap4j-core", version.ref = "pcap4j" }
 pcap4j-packetfactory-static = { module = "org.pcap4j:pcap4j-packetfactory-static", version.ref = "pcap4j" }
-ziti-core = { group = "org.openziti", name="ziti", version.ref="ziti-core" }
 ziti-android = { group = "org.openziti", name="ziti-android", version.ref="ziti-android"}
 kotlin = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "kotlin" }
 coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
@@ -55,14 +49,12 @@ test-rules = { group = "androidx.test", name = "rules", version.ref="test" }
 zxing-android-embedded = { module = "com.journeyapps:zxing-android-embedded", version.ref = "zxing-android-embedded" }
 
 jna = { module = "net.java.dev.jna:jna", version.ref = "jna" }
+core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "core-ktx-version" }
+ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junit-version" }
 
 [plugins]
 android-app = { id = "com.android.application", version.ref = "android" }
-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
-nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus" }
-semver-git = { id = "io.wusa.semver-git-plugin", version.ref = "semver-git" }
 
 [bundles]
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists