Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ble-common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {

android {
namespace 'no.nordicsemi.android.ble.common'
compileSdk 36
compileSdkVersion 36

defaultConfig {
minSdk 18
Expand Down
2 changes: 1 addition & 1 deletion ble-ktx/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {

android {
namespace 'no.nordicsemi.android.ble.ktx'
compileSdk 36
compileSdkVersion 36

defaultConfig {
minSdk 18
Expand Down
4 changes: 2 additions & 2 deletions ble-livedata/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {

android {
namespace 'no.nordicsemi.android.ble.livedata'
compileSdk 36
compileSdkVersion 36

defaultConfig {
minSdk 18
Expand Down Expand Up @@ -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 ===
Expand Down
2 changes: 1 addition & 1 deletion ble/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {

android {
namespace 'no.nordicsemi.android.ble'
compileSdk 36
compileSdkVersion 36

defaultConfig {
minSdk 18
Expand Down
7 changes: 3 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,19 @@ 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"
}
}

allprojects {
repositories {
google()
mavenCentral()
maven { url 'https://jitpack.io' }
}
}

Expand Down
6 changes: 3 additions & 3 deletions examples/ble-gatt-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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'
}
6 changes: 3 additions & 3 deletions examples/ble-gatt-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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'
}
20 changes: 10 additions & 10 deletions examples/trivia/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ plugins {

android {
namespace 'no.nordicsemi.android.ble.trivia'
compileSdk 36
compileSdkVersion 36

defaultConfig {
applicationId "no.nordicsemi.android.ble.trivia"
Expand Down Expand Up @@ -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"
Expand All @@ -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'
Expand Down
6 changes: 4 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
30 changes: 16 additions & 14 deletions test/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
Expand All @@ -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"

Expand All @@ -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
Expand All @@ -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'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -35,7 +36,7 @@ class ScanningManager @Inject constructor(
result
?.let {
found = true
continuation.resume(it.device) {}
continuation.resume(it.device)
}
.also { bluetoothLeScanner.stopScan(this) }
}
Expand Down