Skip to content

Commit 3724c4f

Browse files
philips77philips77
authored
Merge pull request #611 from NordicSemiconductor/dependencies
Dependencies updated
2 parents 5b367f2 + aa6e5fb commit 3724c4f

File tree

9 files changed

+43
-43
lines changed

9 files changed

+43
-43
lines changed

‎ble-common/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ plugins {
44

55
android {
66
namespace 'no.nordicsemi.android.ble.common'
7-
compileSdk 34
7+
compileSdk 35
88

99
defaultConfig {
1010
minSdk 18
11-
targetSdk 34
11+
targetSdk 35
1212
}
1313

1414
buildTypes {

‎ble-ktx/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ plugins {
55

66
android {
77
namespace 'no.nordicsemi.android.ble.ktx'
8-
compileSdk 34
8+
compileSdk 35
99

1010
defaultConfig {
1111
minSdk 18
12-
targetSdk 34
12+
targetSdk 35
1313
}
1414

1515
buildTypes {
@@ -38,7 +38,7 @@ android {
3838

3939
dependencies {
4040
api project(':ble')
41-
api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0'
41+
api 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1'
4242
}
4343

4444
// === Maven Central configuration ===

‎ble-livedata/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ plugins {
44

55
android {
66
namespace 'no.nordicsemi.android.ble.livedata'
7-
compileSdk 34
7+
compileSdk 35
88

99
defaultConfig {
1010
minSdk 18
11-
targetSdk 34
11+
targetSdk 35
1212
}
1313

1414
buildTypes {
@@ -35,7 +35,7 @@ dependencies {
3535
api project(':ble')
3636

3737
// https://developer.android.com/jetpack/androidx/releases/lifecycle
38-
api 'androidx.lifecycle:lifecycle-livedata:2.8.6'
38+
api 'androidx.lifecycle:lifecycle-livedata:2.8.7'
3939
}
4040

4141
// === Maven Central configuration ===

‎ble/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ plugins {
44

55
android {
66
namespace 'no.nordicsemi.android.ble'
7-
compileSdk 34
7+
compileSdk 35
88

99
defaultConfig {
1010
minSdk 18
11-
targetSdk 34
11+
targetSdk 35
1212
}
1313

1414
buildTypes {
@@ -32,7 +32,7 @@ android {
3232
}
3333

3434
dependencies {
35-
api 'androidx.annotation:annotation:1.8.2'
35+
api 'androidx.annotation:annotation:1.9.1'
3636
//noinspection GradleDependency
3737
implementation 'androidx.core:core:1.12.0' // Don't upgrade to 1.13.0, as it increases the minSdk to 19.
3838

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
buildscript {
22
// https://kotlinlang.org/docs/releases.html#release-details
3-
ext.kotlin_version = '2.0.21'
3+
ext.kotlin_version = '2.1.10'
44
// https://plugins.gradle.org/plugin/io.github.gradle-nexus.publish-plugin
55
ext.gradle_nexus_publish_plugin = '2.0.0'
66

@@ -11,10 +11,10 @@ buildscript {
1111
maven { url "https://plugins.gradle.org/m2/" }
1212
}
1313
dependencies {
14-
classpath 'com.android.tools.build:gradle:8.8.0'
14+
classpath 'com.android.tools.build:gradle:8.8.2'
1515
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1616
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlin_version"
17-
classpath "com.google.dagger:hilt-android-gradle-plugin:2.52"
17+
classpath "com.google.dagger:hilt-android-gradle-plugin:2.54"
1818
classpath "io.github.gradle-nexus:publish-plugin:$gradle_nexus_publish_plugin"
1919
classpath "com.squareup.wire:wire-gradle-plugin:5.1.0"
2020
}

‎examples/ble-gatt-client/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ plugins {
55

66
android {
77
namespace 'no.nordicsemi.android.ble.ble_gatt_client'
8-
compileSdk 34
8+
compileSdk 35
99

1010
defaultConfig {
1111
applicationId "no.nordicsemi.android.ble.ble_gatt_client"
1212
minSdk 27
13-
targetSdk 34
13+
targetSdk 35
1414
versionCode 1
1515
versionName "1.0"
1616

@@ -39,9 +39,9 @@ android {
3939
}
4040

4141
dependencies {
42-
implementation 'androidx.core:core-ktx:1.13.1'
42+
implementation 'androidx.core:core-ktx:1.15.0'
4343
implementation 'androidx.appcompat:appcompat:1.7.0'
44-
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
44+
implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
4545

4646
implementation project(':ble-ktx')
4747

‎examples/ble-gatt-server/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ plugins {
55

66
android {
77
namespace 'no.nordicsemi.android.ble.ble_gatt_server'
8-
compileSdk 34
8+
compileSdk 35
99

1010
defaultConfig {
1111
applicationId "no.nordicsemi.android.ble.ble_gatt_server"
1212
minSdk 27
13-
targetSdk 34
13+
targetSdk 35
1414
versionCode 1
1515
versionName "1.0"
1616

@@ -39,9 +39,9 @@ android {
3939
}
4040

4141
dependencies {
42-
implementation 'androidx.core:core-ktx:1.13.1'
42+
implementation 'androidx.core:core-ktx:1.15.0'
4343
implementation 'androidx.appcompat:appcompat:1.7.0'
44-
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
44+
implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
4545

4646
implementation project(':ble-ktx')
4747

‎examples/trivia/build.gradle‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ plugins {
1010

1111
android {
1212
namespace 'no.nordicsemi.android.ble.trivia'
13-
compileSdk 34
13+
compileSdk 35
1414

1515
defaultConfig {
1616
applicationId "no.nordicsemi.android.ble.trivia"
1717
minSdk 21
18-
targetSdk 34
18+
targetSdk 35
1919
versionCode 1
2020
versionName "1.0"
2121
}
@@ -53,23 +53,23 @@ dependencies {
5353
implementation project(path: ':ble-ktx')
5454

5555
// Dagger and Hilt
56-
implementation 'com.google.dagger:hilt-android:2.52'
57-
kapt 'com.google.dagger:hilt-compiler:2.52'
56+
implementation 'com.google.dagger:hilt-android:2.54'
57+
kapt 'com.google.dagger:hilt-compiler:2.54'
5858
implementation 'androidx.hilt:hilt-navigation-compose:1.2.0'
5959
kapt 'androidx.hilt:hilt-compiler:1.2.0'
6060

6161
// Nordic theme
62-
implementation 'no.nordicsemi.android.common:ui:2.1.0'
63-
implementation 'no.nordicsemi.android.common:theme:2.1.0'
64-
implementation 'no.nordicsemi.android.common:permissions-ble:2.1.0'
65-
implementation 'no.nordicsemi.android.common:navigation:2.1.0'
62+
implementation 'no.nordicsemi.android.common:ui:2.4.0'
63+
implementation 'no.nordicsemi.android.common:theme:2.4.0'
64+
implementation 'no.nordicsemi.android.common:permissions-ble:2.4.0'
65+
implementation 'no.nordicsemi.android.common:navigation:2.4.0'
6666

6767
// Jetpack Compose bom
68-
implementation platform('androidx.compose:compose-bom:2024.09.03')
68+
implementation platform('androidx.compose:compose-bom:2025.02.00')
6969

7070
// Text, color, Surface
7171
implementation "androidx.compose.material3:material3"
72-
implementation 'androidx.activity:activity-compose:1.9.2'
72+
implementation 'androidx.activity:activity-compose:1.10.1'
7373
implementation "androidx.compose.runtime:runtime-livedata"
7474

7575
// To show Preview

‎test/build.gradle‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ plugins {
88

99
android {
1010
namespace 'no.nordicsemi.andorid.ble.test'
11-
compileSdk 34
11+
compileSdk 35
1212

1313
defaultConfig {
1414
applicationId "no.nordicsemi.andorid.ble.test"
1515
minSdk 21
16-
targetSdk 34
16+
targetSdk 35
1717
versionCode 1
1818
versionName "1.0"
1919

@@ -49,28 +49,28 @@ android {
4949
dependencies {
5050
implementation project(path: ':ble-ktx')
5151
// Nordic theme
52-
implementation "no.nordicsemi.android.common:ui:2.1.0"
53-
implementation "no.nordicsemi.android.common:theme:2.1.0"
54-
implementation 'no.nordicsemi.android.common:permissions-ble:2.1.0'
55-
implementation 'no.nordicsemi.android.common:navigation:2.1.0'
52+
implementation "no.nordicsemi.android.common:ui:2.4.0"
53+
implementation "no.nordicsemi.android.common:theme:2.4.0"
54+
implementation 'no.nordicsemi.android.common:permissions-ble:2.4.0'
55+
implementation 'no.nordicsemi.android.common:navigation:2.4.0'
5656

5757
implementation 'com.github.jeziellago:compose-markdown:0.4.1'
5858

5959
// Jetpack Compose bom
60-
implementation platform('androidx.compose:compose-bom:2024.09.03')
60+
implementation platform('androidx.compose:compose-bom:2025.02.00')
6161

6262
// Text, Color, Surface
6363
implementation 'androidx.compose.material3:material3'
64-
implementation 'androidx.activity:activity-compose:1.9.2'
65-
implementation 'androidx.lifecycle:lifecycle-runtime-compose:2.8.6'
64+
implementation 'androidx.activity:activity-compose:1.10.1'
65+
implementation 'androidx.lifecycle:lifecycle-runtime-compose:2.8.7'
6666

6767
// Preview
6868
debugImplementation "androidx.compose.ui:ui-tooling"
6969
implementation "androidx.compose.ui:ui-tooling-preview"
7070

7171
// Dagger and Hilt
72-
implementation 'com.google.dagger:hilt-android:2.52'
73-
kapt 'com.google.dagger:hilt-compiler:2.52'
72+
implementation 'com.google.dagger:hilt-android:2.54'
73+
kapt 'com.google.dagger:hilt-compiler:2.54'
7474
implementation 'androidx.hilt:hilt-navigation-compose:1.2.0'
7575
kapt 'androidx.hilt:hilt-compiler:1.2.0'
7676

0 commit comments

Comments
 (0)