Merge pull request #635 from NordicSemiconductor/dependencies

Dependencies and build scripts updated

Author: philips77

.github/workflows/deploy-all.yml

@@ -8,7 +8,7 @@ jobs:
   generateReadme:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: main
           fetch-depth: 0
@@ -28,11 +28,11 @@ jobs:
     needs: generateReadme
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: main
           fetch-depth: 0
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           distribution: 'corretto'
           java-version: '17'

.github/workflows/deploy-to-nexus.yml

@@ -5,10 +5,10 @@ jobs:
   deployAarsToNexus:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           distribution: 'corretto'
           java-version: '17'

.github/workflows/generate-readme.yml

@@ -5,7 +5,7 @@ jobs:
   generateReadme:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - shell: bash

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     // https://kotlinlang.org/docs/releases.html#release-details
-    ext.kotlin_version = '2.2.10'
+    ext.kotlin_version = '2.2.20'
     // https://plugins.gradle.org/plugin/io.github.gradle-nexus.publish-plugin
     ext.gradle_nexus_publish_plugin = '2.0.0'
 
@@ -11,7 +11,7 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.12.2'
+        classpath 'com.android.tools.build:gradle:8.13.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlin_version"
         classpath "com.google.dagger:hilt-android-gradle-plugin:2.57.1"

examples/trivia/build.gradle

@@ -59,8 +59,8 @@ dependencies {
     // Dagger and Hilt
     implementation 'com.google.dagger:hilt-android:2.57.1'
     kapt 'com.google.dagger:hilt-compiler:2.57.1'
-    implementation 'androidx.hilt:hilt-navigation-compose:1.2.0'
-    kapt 'androidx.hilt:hilt-compiler:1.2.0'
+    implementation 'androidx.hilt:hilt-navigation-compose:1.3.0'
+    kapt 'androidx.hilt:hilt-compiler:1.3.0'
 
     // Nordic theme
     implementation 'no.nordicsemi.android.common:ui:2.5.2'
@@ -69,11 +69,11 @@ dependencies {
     implementation 'no.nordicsemi.android.common:navigation:2.5.2'
 
     // Jetpack Compose bom
-    implementation platform('androidx.compose:compose-bom:2025.08.01')
+    implementation platform('androidx.compose:compose-bom:2025.09.00')
 
     // Text, color, Surface
     implementation "androidx.compose.material3:material3"
-    implementation 'androidx.activity:activity-compose:1.10.1'
+    implementation 'androidx.activity:activity-compose:1.11.0'
     implementation "androidx.compose.runtime:runtime-livedata"
 
     // To show Preview

gradle/git-tag-version.gradle

@@ -1,11 +1,10 @@
 ext.getVersionCodeFromTags = { ->
     try {
-        def code = new ByteArrayOutputStream()
-        exec {
-            commandLine 'git', 'tag', '--list'
-            standardOutput = code
-        }
-        return 14 + code.toString().split("\n").size()
+        def listOfTags = providers
+                .exec { commandLine 'git', 'tag', '--list' }
+                .standardOutput
+                .asText.get()
+        return 2 + listOfTags.split("\n").size()
     }
     catch (ignored) {
         return -1
@@ -14,14 +13,15 @@ ext.getVersionCodeFromTags = { ->
 
 ext.getVersionNameFromTags = { ->
     try {
-        def stdout = new ByteArrayOutputStream()
-        exec {
-            commandLine 'git', 'describe', '--tags', '--abbrev=0'
-            standardOutput = stdout
-        }
-        return stdout.toString().trim().split("%")[0]
+        def version = providers
+                .exec { commandLine 'git', 'describe', '--tags', '--abbrev=0' }
+                .standardOutput
+                .asText.get().trim()
+        // Version may have % to add additional information
+        return version.split("%")[0]
     }
     catch (ignored) {
+        ignored.printStackTrace()
         return null
     }
-}
+}

test/build.gradle

@@ -59,11 +59,11 @@ dependencies {
     implementation 'no.nordicsemi.android.common:navigation:2.5.2'
 
     // Jetpack Compose bom
-    implementation platform('androidx.compose:compose-bom:2025.08.01')
+    implementation platform('androidx.compose:compose-bom:2025.09.00')
 
     // Text, Color, Surface
     implementation 'androidx.compose.material3:material3'
-    implementation 'androidx.activity:activity-compose:1.10.1'
+    implementation 'androidx.activity:activity-compose:1.11.0'
     implementation 'androidx.lifecycle:lifecycle-runtime-compose:2.9.3'
 
     // Preview
@@ -73,8 +73,8 @@ dependencies {
     // Dagger and Hilt
     implementation 'com.google.dagger:hilt-android:2.57.1'
     kapt 'com.google.dagger:hilt-compiler:2.57.1'
-    implementation 'androidx.hilt:hilt-navigation-compose:1.2.0'
-    kapt 'androidx.hilt:hilt-compiler:1.2.0'
+    implementation 'androidx.hilt:hilt-navigation-compose:1.3.0'
+    kapt 'androidx.hilt:hilt-compiler:1.3.0'
 
     // Test
     testImplementation 'junit:junit:4.13.2'