Merge pull request #624 from NordicSemiconductor/dependencies

philips77 · web-flow · commit 3374a27b2c06 · 2025-07-04T12:20:54.000+02:00
Dependencies updated
diff --git a/ble-common/build.gradle b/ble-common/build.gradle
@@ -4,11 +4,11 @@ plugins {
 
 android {
     namespace 'no.nordicsemi.android.ble.common'
-    compileSdk 35
+    compileSdk 36
 
     defaultConfig {
         minSdk 18
-        targetSdk 35
+        targetSdk 36
     }
 
     buildTypes {
diff --git a/ble-ktx/build.gradle b/ble-ktx/build.gradle
@@ -1,15 +1,17 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
 }
 
 android {
     namespace 'no.nordicsemi.android.ble.ktx'
-    compileSdk 35
+    compileSdk 36
 
     defaultConfig {
         minSdk 18
-        targetSdk 35
+        targetSdk 36
     }
 
     buildTypes {
@@ -31,14 +33,16 @@ android {
         targetCompatibility JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
     }
 }
 
 dependencies {
     api project(':ble')
-    api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1'
+    api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2'
 }
 
 // === Maven Central configuration ===
diff --git a/ble-livedata/build.gradle b/ble-livedata/build.gradle
@@ -4,11 +4,11 @@ plugins {
 
 android {
     namespace 'no.nordicsemi.android.ble.livedata'
-    compileSdk 35
+    compileSdk 36
 
     defaultConfig {
         minSdk 18
-        targetSdk 35
+        targetSdk 36
     }
 
     buildTypes {
diff --git a/ble/build.gradle b/ble/build.gradle
@@ -4,11 +4,11 @@ plugins {
 
 android {
     namespace 'no.nordicsemi.android.ble'
-    compileSdk 35
+    compileSdk 36
 
     defaultConfig {
         minSdk 18
-        targetSdk 35
+        targetSdk 36
     }
 
     buildTypes {
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     // https://kotlinlang.org/docs/releases.html#release-details
-    ext.kotlin_version = '2.1.21'
+    ext.kotlin_version = '2.2.0'
     // https://plugins.gradle.org/plugin/io.github.gradle-nexus.publish-plugin
     ext.gradle_nexus_publish_plugin = '2.0.0'
 
@@ -11,12 +11,12 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.10.1'
+        classpath 'com.android.tools.build:gradle:8.11.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.54"
+        classpath "com.google.dagger:hilt-android-gradle-plugin:2.56.2"
         classpath "io.github.gradle-nexus:publish-plugin:$gradle_nexus_publish_plugin"
-        classpath "com.squareup.wire:wire-gradle-plugin:5.1.0"
+        classpath "com.squareup.wire:wire-gradle-plugin:5.3.3"
     }
 }
 
diff --git a/examples/ble-gatt-client/build.gradle b/examples/ble-gatt-client/build.gradle
@@ -1,16 +1,18 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
 }
 
 android {
     namespace 'no.nordicsemi.android.ble.ble_gatt_client'
-    compileSdk 35
+    compileSdk 36
 
     defaultConfig {
         applicationId "no.nordicsemi.android.ble.ble_gatt_client"
         minSdk 27
-        targetSdk 35
+        targetSdk 36
         versionCode 1
         versionName "1.0"
 
@@ -33,8 +35,10 @@ android {
         targetCompatibility JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
     }
 }
 
diff --git a/examples/ble-gatt-server/build.gradle b/examples/ble-gatt-server/build.gradle
@@ -1,16 +1,18 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
 }
 
 android {
     namespace 'no.nordicsemi.android.ble.ble_gatt_server'
-    compileSdk 35
+    compileSdk 36
 
     defaultConfig {
         applicationId "no.nordicsemi.android.ble.ble_gatt_server"
         minSdk 27
-        targetSdk 35
+        targetSdk 36
         versionCode 1
         versionName "1.0"
 
@@ -33,8 +35,10 @@ android {
         targetCompatibility JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
     }
 }
 
diff --git a/examples/trivia/build.gradle b/examples/trivia/build.gradle
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
@@ -10,12 +12,12 @@ plugins {
 
 android {
     namespace 'no.nordicsemi.android.ble.trivia'
-    compileSdk 35
+    compileSdk 36
 
     defaultConfig {
         applicationId "no.nordicsemi.android.ble.trivia"
         minSdk 21
-        targetSdk 35
+        targetSdk 36
         versionCode 1
         versionName "1.0"
     }
@@ -31,8 +33,10 @@ android {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+    kotlin {
+        compilerOptions {
+            jvmTarget = JvmTarget.JVM_17
+        }
     }
     buildFeatures {
         compose true
@@ -65,7 +69,7 @@ dependencies {
     implementation 'no.nordicsemi.android.common:navigation:2.4.0'
 
     // Jetpack Compose bom
-    implementation platform('androidx.compose:compose-bom:2025.06.00')
+    implementation platform('androidx.compose:compose-bom:2025.06.01')
 
     // Text, color, Surface
     implementation "androidx.compose.material3:material3"
@@ -79,13 +83,13 @@ dependencies {
     // Retrofit
     implementation 'com.squareup.retrofit2:retrofit:3.0.0'
     implementation 'com.squareup.retrofit2:converter-moshi:3.0.0'
-    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
+    implementation 'com.squareup.okhttp3:okhttp:5.0.0'
     // https://square.github.io/okhttp/changelog/
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.12.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0'
 
     // parse JSON
-    implementation 'com.squareup.moshi:moshi-kotlin:1.15.1'
+    implementation 'com.squareup.moshi:moshi-kotlin:1.15.2'
     // Note: Switching to KSP doesn't work with hilt 2.47 and 2.48:
     //       https://github.com/google/dagger/issues/3965
-    kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.15.1'
+    kapt 'com.squareup.moshi:moshi-kotlin-codegen:1.15.2'
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Aug 27 10:46:52 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,17 @@`
	`1`	`+import org.jetbrains.kotlin.gradle.dsl.JvmTarget`
	`2`	`+`
`1`	`3`	`plugins {`
`2`	`4`	`id 'com.android.library'`
`3`	`5`	`id 'kotlin-android'`
`4`	`6`	`}`
`5`	`7`
`6`	`8`	`android {`
`7`	`9`	`namespace 'no.nordicsemi.android.ble.ktx'`
`8`		`- compileSdk 35`
	`10`	`+ compileSdk 36`
`9`	`11`
`10`	`12`	`defaultConfig {`
`11`	`13`	`minSdk 18`
`12`		`- targetSdk 35`
	`14`	`+ targetSdk 36`
`13`	`15`	`}`
`14`	`16`
`15`	`17`	`buildTypes {`
`@@ -31,14 +33,16 @@ android {`
`31`	`33`	`targetCompatibility JavaVersion.VERSION_17`
`32`	`34`	`}`
`33`	`35`
`34`		`- kotlinOptions {`
`35`		`- jvmTarget = JavaVersion.VERSION_17.toString()`
	`36`	`+ kotlin {`
	`37`	`+ compilerOptions {`
	`38`	`+ jvmTarget = JvmTarget.JVM_17`
	`39`	`+ }`
`36`	`40`	`}`
`37`	`41`	`}`
`38`	`42`
`39`	`43`	`dependencies {`
`40`	`44`	`api project(':ble')`
`41`		`- api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1'`
	`45`	`+ api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2'`
`42`	`46`	`}`
`43`	`47`
`44`	`48`	`// === Maven Central configuration ===`