Skip to content

Commit

Permalink
Merge pull request #595 from NordicSemiconductor/dependencies
Browse files Browse the repository at this point in the history
Dependencies updated
  • Loading branch information
philips77 authored Oct 10, 2024
2 parents 794e94f + ddfbe64 commit cfecc7d
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion ble/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ android {

dependencies {
api 'androidx.annotation:annotation:1.8.2'
implementation 'androidx.core:core:1.13.1'
//noinspection GradleDependency
implementation 'androidx.core:core:1.12.0' // Don't upgrade to 1.13.0, as it increases the minSdk to 19.

testImplementation 'junit:junit:4.13.2'
}
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
// https://kotlinlang.org/docs/releases.html#release-details
ext.kotlin_version = '2.0.20'
ext.kotlin_version = '2.0.21'
// https://plugins.gradle.org/plugin/io.github.gradle-nexus.publish-plugin
ext.gradle_nexus_publish_plugin = '2.0.0'

Expand All @@ -11,7 +11,7 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath 'com.android.tools.build:gradle:8.6.1'
classpath 'com.android.tools.build:gradle:8.7.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.52"
Expand Down
2 changes: 1 addition & 1 deletion examples/trivia/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ dependencies {
implementation 'no.nordicsemi.android.common:navigation:2.1.0'

// Jetpack Compose bom
implementation platform('androidx.compose:compose-bom:2024.09.02')
implementation platform('androidx.compose:compose-bom:2024.09.03')

// Text, color, Surface
implementation "androidx.compose.material3:material3"
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.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ dependencies {
implementation 'com.github.jeziellago:compose-markdown:0.4.1'

// Jetpack Compose bom
implementation platform('androidx.compose:compose-bom:2024.09.02')
implementation platform('androidx.compose:compose-bom:2024.09.03')

// Text, Color, Surface
implementation 'androidx.compose.material3:material3'
Expand Down

0 comments on commit cfecc7d

Please sign in to comment.