diff --git a/ble-common/build.gradle b/ble-common/build.gradle index 235da259..3bc02a28 100644 --- a/ble-common/build.gradle +++ b/ble-common/build.gradle @@ -4,7 +4,7 @@ plugins { android { namespace 'no.nordicsemi.android.ble.common' - compileSdk 36 + compileSdkVersion 36 defaultConfig { minSdk 18 diff --git a/ble-ktx/build.gradle b/ble-ktx/build.gradle index b08bccc7..b9482636 100644 --- a/ble-ktx/build.gradle +++ b/ble-ktx/build.gradle @@ -7,7 +7,7 @@ plugins { android { namespace 'no.nordicsemi.android.ble.ktx' - compileSdk 36 + compileSdkVersion 36 defaultConfig { minSdk 18 diff --git a/ble-livedata/build.gradle b/ble-livedata/build.gradle index bb6e98b4..c985cdcc 100644 --- a/ble-livedata/build.gradle +++ b/ble-livedata/build.gradle @@ -4,7 +4,7 @@ plugins { android { namespace 'no.nordicsemi.android.ble.livedata' - compileSdk 36 + compileSdkVersion 36 defaultConfig { minSdk 18 @@ -35,7 +35,7 @@ dependencies { api project(':ble') // https://developer.android.com/jetpack/androidx/releases/lifecycle - api 'androidx.lifecycle:lifecycle-livedata:2.9.1' + api 'androidx.lifecycle:lifecycle-livedata:2.9.2' } // === Maven Central configuration === diff --git a/ble/build.gradle b/ble/build.gradle index 050d2895..35ff9eef 100644 --- a/ble/build.gradle +++ b/ble/build.gradle @@ -4,7 +4,7 @@ plugins { android { namespace 'no.nordicsemi.android.ble' - compileSdk 36 + compileSdkVersion 36 defaultConfig { minSdk 18 diff --git a/build.gradle b/build.gradle index f4c506a8..ce337610 100644 --- a/build.gradle +++ b/build.gradle @@ -11,12 +11,12 @@ buildscript { maven { url "https://plugins.gradle.org/m2/" } } dependencies { - classpath 'com.android.tools.build:gradle:8.11.0' + classpath 'com.android.tools.build:gradle:8.12.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.56.2" + classpath "com.google.dagger:hilt-android-gradle-plugin:2.57" classpath "io.github.gradle-nexus:publish-plugin:$gradle_nexus_publish_plugin" - classpath "com.squareup.wire:wire-gradle-plugin:5.3.3" + classpath "com.squareup.wire:wire-gradle-plugin:5.3.7" } } @@ -24,7 +24,6 @@ allprojects { repositories { google() mavenCentral() - maven { url 'https://jitpack.io' } } } diff --git a/examples/ble-gatt-client/build.gradle b/examples/ble-gatt-client/build.gradle index 9c99a8f2..dc8d01db 100644 --- a/examples/ble-gatt-client/build.gradle +++ b/examples/ble-gatt-client/build.gradle @@ -7,7 +7,7 @@ plugins { android { namespace 'no.nordicsemi.android.ble.ble_gatt_client' - compileSdk 36 + compileSdkVersion 36 defaultConfig { applicationId "no.nordicsemi.android.ble.ble_gatt_client" @@ -50,6 +50,6 @@ dependencies { implementation project(':ble-ktx') testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.2.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' + androidTestImplementation 'androidx.test.ext:junit:1.3.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0' } diff --git a/examples/ble-gatt-server/build.gradle b/examples/ble-gatt-server/build.gradle index bf270941..e2c1b35a 100644 --- a/examples/ble-gatt-server/build.gradle +++ b/examples/ble-gatt-server/build.gradle @@ -7,7 +7,7 @@ plugins { android { namespace 'no.nordicsemi.android.ble.ble_gatt_server' - compileSdk 36 + compileSdkVersion 36 defaultConfig { applicationId "no.nordicsemi.android.ble.ble_gatt_server" @@ -50,6 +50,6 @@ dependencies { implementation project(':ble-ktx') testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.2.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' + androidTestImplementation 'androidx.test.ext:junit:1.3.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.7.0' } diff --git a/examples/trivia/build.gradle b/examples/trivia/build.gradle index e6caaf03..95eec3d2 100644 --- a/examples/trivia/build.gradle +++ b/examples/trivia/build.gradle @@ -12,7 +12,7 @@ plugins { android { namespace 'no.nordicsemi.android.ble.trivia' - compileSdk 36 + compileSdkVersion 36 defaultConfig { applicationId "no.nordicsemi.android.ble.trivia" @@ -57,19 +57,19 @@ dependencies { implementation project(path: ':ble-ktx') // Dagger and Hilt - implementation 'com.google.dagger:hilt-android:2.56.2' - kapt 'com.google.dagger:hilt-compiler:2.56.2' + implementation 'com.google.dagger:hilt-android:2.57' + kapt 'com.google.dagger:hilt-compiler:2.57' implementation 'androidx.hilt:hilt-navigation-compose:1.2.0' kapt 'androidx.hilt:hilt-compiler:1.2.0' // Nordic theme - implementation 'no.nordicsemi.android.common:ui:2.4.0' - implementation 'no.nordicsemi.android.common:theme:2.4.0' - implementation 'no.nordicsemi.android.common:permissions-ble:2.4.0' - implementation 'no.nordicsemi.android.common:navigation:2.4.0' + implementation 'no.nordicsemi.android.common:ui:2.5.1' + implementation 'no.nordicsemi.android.common:theme:2.5.1' + implementation 'no.nordicsemi.android.common:permissions-ble:2.5.1' + implementation 'no.nordicsemi.android.common:navigation:2.5.1' // Jetpack Compose bom - implementation platform('androidx.compose:compose-bom:2025.06.01') + implementation platform('androidx.compose:compose-bom:2025.07.00') // Text, color, Surface implementation "androidx.compose.material3:material3" @@ -83,9 +83,9 @@ dependencies { // Retrofit implementation 'com.squareup.retrofit2:retrofit:3.0.0' implementation 'com.squareup.retrofit2:converter-moshi:3.0.0' - implementation 'com.squareup.okhttp3:okhttp:5.0.0' + implementation 'com.squareup.okhttp3:okhttp:5.1.0' // https://square.github.io/okhttp/changelog/ - implementation 'com.squareup.okhttp3:logging-interceptor:5.0.0' + implementation 'com.squareup.okhttp3:logging-interceptor:5.1.0' // parse JSON implementation 'com.squareup.moshi:moshi-kotlin:1.15.2' diff --git a/gradle.properties b/gradle.properties index f2167ea9..fa88d5f2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,12 +11,14 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true #Fri Sep 30 12:50:58 CEST 2022 +android.useAndroidX=true +org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M" +org.gradle.configuration-cache=true + POM_LICENCE=BSD-3-Clause POM_DESCRIPTION=Bluetooth Low Energy library for Android POM_LICENCE_URL=http\://opensource.org/licenses/BSD-3-Clause -org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M" POM_SCM_CONNECTION=scm\:git@github.com\:NordicSemiconductor/Android-BLE-Library.git -android.useAndroidX=true POM_DEVELOPER_ID=philips77 POM_DEVELOPER_NAME=Aleksander Nowakowski GROUP=no.nordicsemi.android diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2678005c..8b111a25 100644 --- 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.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/test/build.gradle b/test/build.gradle index f8e52322..95e4bce9 100644 --- a/test/build.gradle +++ b/test/build.gradle @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id 'com.android.application' id 'org.jetbrains.kotlin.android' @@ -8,12 +10,12 @@ plugins { android { namespace 'no.nordicsemi.andorid.ble.test' - compileSdk 35 + compileSdkVersion 36 defaultConfig { applicationId "no.nordicsemi.andorid.ble.test" minSdk 21 - targetSdk 35 + targetSdk 36 versionCode 1 versionName "1.0" @@ -33,8 +35,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 @@ -49,28 +53,26 @@ android { dependencies { implementation project(path: ':ble-ktx') // Nordic theme - implementation "no.nordicsemi.android.common:ui:2.4.0" - implementation "no.nordicsemi.android.common:theme:2.4.0" - implementation 'no.nordicsemi.android.common:permissions-ble:2.4.0' - implementation 'no.nordicsemi.android.common:navigation:2.4.0' - - implementation 'com.github.jeziellago:compose-markdown:0.4.1' + implementation "no.nordicsemi.android.common:ui:2.5.1" + implementation "no.nordicsemi.android.common:theme:2.5.1" + implementation 'no.nordicsemi.android.common:permissions-ble:2.5.1' + implementation 'no.nordicsemi.android.common:navigation:2.5.1' // Jetpack Compose bom - implementation platform('androidx.compose:compose-bom:2025.06.00') + implementation platform('androidx.compose:compose-bom:2025.07.00') // Text, Color, Surface implementation 'androidx.compose.material3:material3' implementation 'androidx.activity:activity-compose:1.10.1' - implementation 'androidx.lifecycle:lifecycle-runtime-compose:2.9.1' + implementation 'androidx.lifecycle:lifecycle-runtime-compose:2.9.2' // Preview debugImplementation "androidx.compose.ui:ui-tooling" implementation "androidx.compose.ui:ui-tooling-preview" // Dagger and Hilt - implementation 'com.google.dagger:hilt-android:2.56.2' - kapt 'com.google.dagger:hilt-compiler:2.56.2' + implementation 'com.google.dagger:hilt-android:2.57' + kapt 'com.google.dagger:hilt-compiler:2.57' implementation 'androidx.hilt:hilt-navigation-compose:1.2.0' kapt 'androidx.hilt:hilt-compiler:1.2.0' diff --git a/test/src/main/java/no/nordicsemi/andorid/ble/test/client/repository/ScanningManager.kt b/test/src/main/java/no/nordicsemi/andorid/ble/test/client/repository/ScanningManager.kt index 28d1fa5e..aa6d3771 100644 --- a/test/src/main/java/no/nordicsemi/andorid/ble/test/client/repository/ScanningManager.kt +++ b/test/src/main/java/no/nordicsemi/andorid/ble/test/client/repository/ScanningManager.kt @@ -9,6 +9,7 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.suspendCancellableCoroutine import no.nordicsemi.andorid.ble.test.spec.Characteristics.UUID_SERVICE_DEVICE import javax.inject.Inject +import kotlin.coroutines.resume import kotlin.coroutines.resumeWithException @OptIn(ExperimentalCoroutinesApi::class) @@ -35,7 +36,7 @@ class ScanningManager @Inject constructor( result ?.let { found = true - continuation.resume(it.device) {} + continuation.resume(it.device) } .also { bluetoothLeScanner.stopScan(this) } }