Skip to content

Commit

Permalink
Merge pull request #32 from Supercaly/gradle-update
Browse files Browse the repository at this point in the history
Gradle: Update dependencies after some time
  • Loading branch information
Supercaly committed Oct 9, 2023
2 parents 554602d + 86835d8 commit 69c1e17
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 37 deletions.
43 changes: 22 additions & 21 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ plugins {
alias libs.plugins.kotlinPlugin apply false
alias libs.plugins.junit5Plugin apply false
alias libs.plugins.ktlintPlugin apply false
alias libs.plugins.kspPlugin apply false
alias libs.plugins.versionsPlugin apply false
}
21 changes: 13 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
[versions]
core_ktx = '1.9.0'
coroutines_android = '1.6.4'
junit5 = '5.9.2'
mockk = '1.13.4'
truth = '1.1.3'
core_ktx = '1.10.1'
coroutines_android = '1.7.3'
junit5 = '5.10.0'
mockk = '1.13.5'
truth = '1.1.5'
lifecycle_runtime = '2.6.0-beta01'
play_services_wearable = '18.0.0'
legacy_support_v4 = '1.0.0'
compose = '1.4.0-beta01'
wear_compose = '1.2.0-alpha04'
compose_lifecycle_viewmodel = '2.5.1'
activity_compose = '1.6.1'
tflite = '2.11.0'
room = '2.5.0'
tflite = '2.13.0'
room = '2.5.2'
work_ktx = '2.8.1'

composeCompiler = '1.4.2'

android_plugin = "8.0.0"
android_plugin = "8.1.2"
kotlin_plugin = '1.8.10'
junit5_plugin = '1.8.2.1'
ktlint_plugin = '11.2.0'
versions_plugin = '0.45.0'
ksp_plugin = '1.8.10-1.0.9'

[libraries]
core = { module = 'androidx.core:core-ktx', version.ref = 'core_ktx' }
Expand Down Expand Up @@ -56,6 +58,8 @@ room-compiler = { module = 'androidx.room:room-compiler', version.ref = 'room' }
room-kotlin = { module = 'androidx.room:room-ktx', version.ref = 'room' }
room-testing = { module = 'androidx.room:room-testing', version.ref = 'room' }

work = { module = 'androidx.work:work-runtime-ktx', version.ref = 'work_ktx'}

[bundles]
tflite = ['tflite-core', 'tflite-gpu', 'tflite-gpuApi']

Expand All @@ -66,3 +70,4 @@ kotlinPlugin = { id = 'org.jetbrains.kotlin.android', version.ref = 'kotlin_plug
junit5Plugin = { id = 'de.mannodermaus.android-junit5', version.ref = 'junit5_plugin' }
ktlintPlugin = { id = 'org.jlleitschuh.gradle.ktlint', version.ref = 'ktlint_plugin' }
versionsPlugin = { id = 'com.github.ben-manes.versions', version.ref = 'versions_plugin' }
kspPlugin = { id = 'com.google.devtools.ksp', version.ref = 'ksp_plugin' }
7 changes: 3 additions & 4 deletions recorder/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'handmonitor.android-app-wear-conventions'
id 'handmonitor.android-compose-wear-conventions'
id 'kotlin-kapt'
id 'com.google.devtools.ksp'
}

android {
Expand All @@ -15,11 +15,10 @@ android {
}

dependencies {
// TODO: Move work version to catalog
implementation "androidx.work:work-runtime-ktx:2.8.0"
implementation libs.work
implementation project(path: ":sensorlib")
implementation libs.room.runtime
kapt libs.room.compiler
ksp libs.room.compiler
implementation libs.room.kotlin
testImplementation libs.room.testing
}
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ import com.handmonitor.recorder.database.dao.RecordingDao
*/
@Database(
version = 1,
entities = [Recording::class]
entities = [Recording::class],
exportSchema = false
)
abstract class AppDatabase : RoomDatabase() {
companion object {
Expand Down
4 changes: 2 additions & 2 deletions wear/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'handmonitor.android-app-wear-conventions'
id 'handmonitor.android-compose-wear-conventions'
id 'kotlin-kapt'
id 'com.google.devtools.ksp'
}

android {
Expand All @@ -19,7 +19,7 @@ dependencies {
implementation project(path: ':sensorlib')
implementation libs.bundles.tflite
implementation libs.room.runtime
kapt libs.room.compiler
ksp libs.room.compiler
implementation libs.room.kotlin
testImplementation libs.room.testing
}

0 comments on commit 69c1e17

Please sign in to comment.