Merge pull request #145 from Semper-Viventem/update-deps

Update dependencies and jdk
Semper-Viventem · Aug 1, 2024 · f301193 · f301193
2 parents 22326c5 + fe77725
commit f301193
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 35 deletions.
diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml
@@ -12,11 +12,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: set up JDK 17
+    - name: set up JDK 22
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
-        distribution: 'temurin'
+        java-version: '22'
+        distribution: 'oracle'
         cache: gradle
 
     - name: Grant execute permission for gradlew

diff --git a/.github/workflows/publish_debug.yml b/.github/workflows/publish_debug.yml
@@ -12,11 +12,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: set up JDK 17
+      - name: set up JDK 22
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
-          distribution: 'temurin'
+          java-version: '22'
+          distribution: 'oracle'
           cache: gradle
 
       - name: Grant execute permission for gradlew

diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
@@ -13,11 +13,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: set up JDK 17
+      - name: set up JDK 22
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
-          distribution: 'temurin'
+          java-version: '22'
+          distribution: 'oracle'
           cache: gradle
 
       - name: Grant execute permission for gradlew

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
     id("org.jetbrains.kotlin.android")
     id("com.google.devtools.ksp")
     id("androidx.room")
+    alias(libs.plugins.compose.compiler)
 }
 
 room {
@@ -24,8 +25,8 @@ android {
         minSdk = 29
         targetSdk = 34
 
-        versionCode = 1708536355
-        versionName = "0.25.3-beta"
+        versionCode = 1708536356
+        versionName = "0.26.0-beta"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
@@ -51,10 +52,10 @@ android {
             keyPassword = "metaradar-debug-keystore"
         }
         maybeCreate(RELEASE).apply {
-            storeFile = file(gradleLocalProperties(rootDir).getProperty("releaseStoreFile", System.getenv("RELEASE_STORE_PATH") ?: "/"))
-            storePassword = gradleLocalProperties(rootDir).getProperty("releaseStorePassword", System.getenv("RELEASE_STORE_PASSWORD") ?: "")
-            keyAlias = gradleLocalProperties(rootDir).getProperty("releaseKeyAlias", System.getenv("RELEASE_STORE_KEY") ?: "")
-            keyPassword = gradleLocalProperties(rootDir).getProperty("releaseKeyPassword", System.getenv("RELEASE_STORE_KEY_PASSWORD") ?: "")
+            storeFile = file(gradleLocalProperties(rootDir, providers).getProperty("releaseStoreFile", System.getenv("RELEASE_STORE_PATH") ?: "/"))
+            storePassword = gradleLocalProperties(rootDir, providers).getProperty("releaseStorePassword", System.getenv("RELEASE_STORE_PASSWORD") ?: "")
+            keyAlias = gradleLocalProperties(rootDir, providers).getProperty("releaseKeyAlias", System.getenv("RELEASE_STORE_KEY") ?: "")
+            keyPassword = gradleLocalProperties(rootDir, providers).getProperty("releaseKeyPassword", System.getenv("RELEASE_STORE_KEY_PASSWORD") ?: "")
         }
     }
 
@@ -71,7 +72,7 @@ android {
             isShrinkResources = true
             isDebuggable = false
 
-            val hasSignConfig = gradleLocalProperties(rootDir).getProperty("releaseStoreFile", System.getenv("RELEASE_STORE_PATH") ?: NO_SIGNING_CONFIG) != NO_SIGNING_CONFIG
+            val hasSignConfig = gradleLocalProperties(rootDir, providers).getProperty("releaseStoreFile", System.getenv("RELEASE_STORE_PATH") ?: NO_SIGNING_CONFIG) != NO_SIGNING_CONFIG
 
             signingConfig = if (hasSignConfig) signingConfigs[RELEASE] else null
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
@@ -107,16 +108,16 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_22
+        targetCompatibility = JavaVersion.VERSION_22
     }
 
     kotlin {
-        jvmToolchain(17)
+        jvmToolchain(22)
     }
 
     kotlinOptions {
-        jvmTarget = "17"
+        jvmTarget = "22"
     }
 
     buildFeatures.apply {

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     alias(libs.plugins.android.lib) apply false
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.serialization) apply false
+    alias(libs.plugins.compose.compiler) apply false
     alias(libs.plugins.kotlin.ksp) apply false
     alias(libs.plugins.room) apply false
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,21 +1,21 @@
 [versions]
 # You also need to bump the version of ksp, anvil, compose
-kotlin-general = "1.9.21"
+kotlin-general = "2.0.0"
 kotlinx = "1.7.3"
-ksp = "1.9.21-1.0.16"
+ksp = "2.0.0-1.0.24"
 anvil = "2.4.2"
-android-gradle = "8.2.0"
+android-gradle = "8.5.1"
 protobuf = "3.21.7"
 protobuf-gradle = "0.9.1"
 # Protobuf JVM library https://github.com/flipperdevices/flipperzero-protobuf-jvm
 protobuf-jvm = "0.12.0-0.3.0"
-compose = "1.5.4"
+compose = "1.6.8"
 compose-wear = "1.0.2"
 compose-compiler = "1.5.6"
 compose-accompanist = "0.28.0"
 compose-constraint = "1.0.1"
-compose-navigation = "2.5.2"
-compose-material3 = "1.2.0-beta01"
+compose-navigation = "2.7.7"
+compose-material3 = "1.2.1"
 horologist = "0.1.13"
 serialization-json = "1.4.0"
 wear = "1.2.0"
@@ -31,19 +31,19 @@ sentry-gradle = "3.2.0"
 zip4j = "2.11.2"
 seismic = "1.0.3"
 cicerone = "7.1"
-ktx = "1.12.0"
+ktx = "1.13.1"
 ktx-fragment = "1.6.2"
-ktx-activity = "1.8.2"
+ktx-activity = "1.9.1"
 ktx-testing = "1.1.5"
-lifecycle = "2.5.1"
+lifecycle = "2.8.4"
 # https://github.com/vigna/fastutil/issues/136
 fastutil = "7.2.1"
 ble = "2.5.1"
 ble-scan = "1.6.0"
 lottie = "5.2.0"
-material = "1.6.1"
-annotations = "1.4.0"
-appcompat = "1.5.1"
+material = "1.12.0"
+annotations = "1.8.1"
+appcompat = "1.7.0"
 datastore = "1.0.0"
 # https://github.com/vsch/flexmark-java/issues/442
 flexmark = "0.42.14"
@@ -59,7 +59,7 @@ detekt-gradle = "1.21.0"
 grgit-gradle = "8d818b74b9"
 tangle = "0.15.1"
 work = "2.7.1"
-concurrent = "1.1.0"
+concurrent = "1.2.0"
 koin = "3.2.2"
 koin-android = "3.3.0"
 koin-android-compose = "3.3.0"
@@ -252,3 +252,4 @@ ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint-gradle" }
 protobuf = { id = "com.google.protobuf", version.ref = "protobuf-gradle" }
 square-anvil = { id = "com.squareup.anvil", version.ref = "anvil" }
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt-gradle" }
+compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin-general" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 18 19:58:11 EET 2023
+#Thu Aug 01 15:27:36 PDT 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists