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
Dependencies updated
  • Loading branch information
philips77 committed Sep 12, 2024
commit f1f06aef08fee03046ddd0aaa1f3cfcbaf28ae99
2 changes: 1 addition & 1 deletion ble-livedata/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ dependencies {
api project(':ble')

// https://developer.android.com/jetpack/androidx/releases/lifecycle
api 'androidx.lifecycle:lifecycle-livedata:2.8.4'
api 'androidx.lifecycle:lifecycle-livedata:2.8.5'
}

// === Maven Central configuration ===
Expand Down
10 changes: 5 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ buildscript {
// https://kotlinlang.org/docs/releases.html#release-details
ext.kotlin_version = '2.0.20'
// https://plugins.gradle.org/plugin/io.github.gradle-nexus.publish-plugin
ext.gradle_nexus_publish_plugin = '1.3.0'
ext.gradle_nexus_publish_plugin = '2.0.0'

repositories {
google()
Expand All @@ -11,12 +11,12 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath 'com.android.tools.build:gradle:8.5.2'
classpath 'com.android.tools.build:gradle:8.6.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.51.1"
classpath "com.google.dagger:hilt-android-gradle-plugin:2.52"
classpath "io.github.gradle-nexus:publish-plugin:$gradle_nexus_publish_plugin"
classpath "com.squareup.wire:wire-gradle-plugin:4.7.0"
classpath "com.squareup.wire:wire-gradle-plugin:5.1.0"
}
}

Expand All @@ -29,7 +29,7 @@ allprojects {
}

tasks.register('clean', Delete) {
delete rootProject.buildDir
delete rootProject.layout.buildDirectory
}

// Maven Central publishing
Expand Down
16 changes: 8 additions & 8 deletions examples/trivia/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -53,23 +53,23 @@ dependencies {
implementation project(path: ':ble-ktx')

// Dagger and Hilt
implementation 'com.google.dagger:hilt-android:2.51.1'
kapt 'com.google.dagger:hilt-compiler:2.51.1'
implementation 'com.google.dagger:hilt-android:2.52'
kapt 'com.google.dagger:hilt-compiler:2.52'
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.0.0'
implementation 'no.nordicsemi.android.common:theme:2.0.0'
implementation 'no.nordicsemi.android.common:permissions-ble:2.0.0'
implementation 'no.nordicsemi.android.common:navigation:2.0.0'
implementation 'no.nordicsemi.android.common:ui:2.1.0'
implementation 'no.nordicsemi.android.common:theme:2.1.0'
implementation 'no.nordicsemi.android.common:permissions-ble:2.1.0'
implementation 'no.nordicsemi.android.common:navigation:2.1.0'

// Jetpack Compose bom
implementation platform('androidx.compose:compose-bom:2024.08.00')
implementation platform('androidx.compose:compose-bom:2024.09.01')

// Text, color, Surface
implementation "androidx.compose.material3:material3"
implementation 'androidx.activity:activity-compose:1.9.1'
implementation 'androidx.activity:activity-compose:1.9.2'
implementation "androidx.compose.runtime:runtime-livedata"

// To show Preview
Expand Down
20 changes: 10 additions & 10 deletions test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,28 +49,28 @@ android {
dependencies {
implementation project(path: ':ble-ktx')
// Nordic theme
implementation "no.nordicsemi.android.common:ui:2.0.0"
implementation "no.nordicsemi.android.common:theme:2.0.0"
implementation 'no.nordicsemi.android.common:permissions-ble:2.0.0'
implementation 'no.nordicsemi.android.common:navigation:2.0.0'
implementation "no.nordicsemi.android.common:ui:2.1.0"
implementation "no.nordicsemi.android.common:theme:2.1.0"
implementation 'no.nordicsemi.android.common:permissions-ble:2.1.0'
implementation 'no.nordicsemi.android.common:navigation:2.1.0'

implementation 'com.github.jeziellago:compose-markdown:0.3.6'
implementation 'com.github.jeziellago:compose-markdown:0.4.1'

// Jetpack Compose bom
implementation platform('androidx.compose:compose-bom:2024.08.00')
implementation platform('androidx.compose:compose-bom:2024.09.01')

// Text, Color, Surface
implementation 'androidx.compose.material3:material3'
implementation 'androidx.activity:activity-compose:1.9.1'
implementation "androidx.lifecycle:lifecycle-runtime-compose:2.8.4"
implementation 'androidx.activity:activity-compose:1.9.2'
implementation "androidx.lifecycle:lifecycle-runtime-compose:2.8.5"

// Preview
debugImplementation "androidx.compose.ui:ui-tooling"
implementation "androidx.compose.ui:ui-tooling-preview"

// Dagger and Hilt
implementation 'com.google.dagger:hilt-android:2.51.1'
kapt 'com.google.dagger:hilt-compiler:2.51.1'
implementation 'com.google.dagger:hilt-android:2.52'
kapt 'com.google.dagger:hilt-compiler:2.52'
implementation 'androidx.hilt:hilt-navigation-compose:1.2.0'
kapt 'androidx.hilt:hilt-compiler:1.2.0'

Expand Down