From 668a5bbdb926ac207c7f276ae8c7eed9e421e356 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Thu, 10 Feb 2022 17:13:42 +0100 Subject: [PATCH] unify version naming --- app/build.gradle | 2 +- build.gradle | 22 +++++++++++----------- core/core_dependencies.gradle | 22 +++++++++++----------- database/build.gradle | 2 +- gradle/test_dependencies.gradle | 8 ++++---- wear/build.gradle | 10 +++++----- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e94c3d61ef..cc26a49966 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,7 +109,7 @@ android { defaultConfig { multiDexEnabled true versionCode 1500 - version "3.0.0.1" + version "3.0.0.1-dev" buildConfigField "String", "VERSION", '"' + version + '"' buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"' buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"' diff --git a/build.gradle b/build.gradle index 419d8ccd94..0c9dca8867 100644 --- a/build.gradle +++ b/build.gradle @@ -3,17 +3,17 @@ buildscript { ext { kotlin_version = '1.6.10' - coreVersion = '1.6.0' + core_version = '1.6.0' rxjava_version = '2.2.21' rxandroid_version = '2.1.1' rxkotlin_version = '2.4.0' room_version = '2.3.0' lifecycle_version = '2.3.1' dagger_version = '2.40.5' - coroutinesVersion = '1.4.1' - activityVersion = '1.3.1' + coroutines_version = '1.4.1' + activity_version = '1.3.1' fragmentktx_version = '1.3.6' - ormLiteVersion = '4.46' + ormLite_version = '4.46' nav_version = '2.3.5' appcompat_version = '1.3.1' material_version = '1.4.0' @@ -26,14 +26,14 @@ buildscript { tink_version = '1.5.0' junit_version = '4.13.2' - mockitoVersion = '4.3.1' - dexmakerVersion = "1.2" - retrofit2Version = '2.9.0' - okhttp3Version = '4.9.0' - byteBuddyVersion = '1.12.3' + mockito_version = '4.3.1' + dexmaker_version = "1.2" + retrofit2_version = '2.9.0' + okhttp3_version = '4.9.0' + byteBuddy_version = '1.12.3' - androidx_junit = '1.1.2' - androidx_rules = '1.4.0-alpha04' + androidx_junit_version = '1.1.2' + androidx_rules_version = '1.4.0' } repositories { google() diff --git a/core/core_dependencies.gradle b/core/core_dependencies.gradle index 5c3ff80a57..0fb1846296 100644 --- a/core/core_dependencies.gradle +++ b/core/core_dependencies.gradle @@ -3,16 +3,16 @@ dependencies { api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" api "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" - api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" - api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion" - api "androidx.core:core-ktx:$coreVersion" + api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" + api "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version" + api "androidx.core:core-ktx:$core_version" api 'androidx.legacy:legacy-support-v13:1.0.0' api 'androidx.legacy:legacy-support-v4:1.0.0' api "androidx.appcompat:appcompat:$appcompat_version" api "androidx.preference:preference-ktx:$preferencektx_version" api 'androidx.biometric:biometric:1.1.0' api "androidx.browser:browser:1.3.0" - api "androidx.activity:activity-ktx:${activityVersion}" + api "androidx.activity:activity-ktx:${activity_version}" api "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version" api 'androidx.cardview:cardview:1.0.0' api 'androidx.recyclerview:recyclerview:1.2.1' @@ -47,8 +47,8 @@ dependencies { api "com.jjoe64:graphview:4.0.1" //db - api "com.j256.ormlite:ormlite-core:${ormLiteVersion}" - api "com.j256.ormlite:ormlite-android:${ormLiteVersion}" + api "com.j256.ormlite:ormlite-core:${ormLite_version}" + api "com.j256.ormlite:ormlite-android:${ormLite_version}" // pumpCommon api "com.google.code.gson:gson:2.8.7" @@ -65,11 +65,11 @@ dependencies { api 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava' // new for tidepool - api "com.squareup.okhttp3:okhttp:$okhttp3Version" - api "com.squareup.okhttp3:logging-interceptor:$okhttp3Version" - api "com.squareup.retrofit2:retrofit:$retrofit2Version" - api "com.squareup.retrofit2:adapter-rxjava2:$retrofit2Version" - api "com.squareup.retrofit2:converter-gson:$retrofit2Version" + api "com.squareup.okhttp3:okhttp:$okhttp3_version" + api "com.squareup.okhttp3:logging-interceptor:$okhttp3_version" + api "com.squareup.retrofit2:retrofit:$retrofit2_version" + api "com.squareup.retrofit2:adapter-rxjava2:$retrofit2_version" + api "com.squareup.retrofit2:converter-gson:$retrofit2_version" api "com.joanzapata.iconify:android-iconify-fontawesome:2.2.2" api 'net.danlew:android.joda:2.10.6' diff --git a/database/build.gradle b/database/build.gradle index 95571ee4ae..61b628e296 100644 --- a/database/build.gradle +++ b/database/build.gradle @@ -18,7 +18,7 @@ android { } dependencies { - api "androidx.core:core-ktx:$coreVersion" + api "androidx.core:core-ktx:$core_version" api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" api "io.reactivex.rxjava2:rxjava:$rxjava_version" diff --git a/gradle/test_dependencies.gradle b/gradle/test_dependencies.gradle index ec62814a21..6c7b5a0abb 100644 --- a/gradle/test_dependencies.gradle +++ b/gradle/test_dependencies.gradle @@ -1,8 +1,8 @@ dependencies { testImplementation "junit:junit:$junit_version" testImplementation 'org.json:json:20210307' - testImplementation "org.mockito:mockito-core:$mockitoVersion" - testImplementation "org.mockito:mockito-inline:$mockitoVersion" + testImplementation "org.mockito:mockito-core:$mockito_version" + testImplementation "org.mockito:mockito-inline:$mockito_version" testImplementation "joda-time:joda-time:$jodatime_version" testImplementation('com.google.truth:truth:1.1.3') { exclude group: "com.google.guava", module: "guava" @@ -11,8 +11,8 @@ dependencies { testImplementation "org.hamcrest:hamcrest-all:1.3" androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' - androidTestImplementation "androidx.test.ext:junit:$androidx_junit" - androidTestImplementation "androidx.test:rules:$androidx_rules" + androidTestImplementation "androidx.test.ext:junit-ktx:$androidx_junit_version" + androidTestImplementation "androidx.test:rules:$androidx_rules_version" androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0' } diff --git a/wear/build.gradle b/wear/build.gradle index 120a6db581..bb1104bd2e 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -100,7 +100,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation "androidx.core:core-ktx:$coreVersion" + implementation "androidx.core:core-ktx:$core_version" implementation "androidx.appcompat:appcompat:$appcompat_version" implementation "androidx.preference:preference-ktx:$preferencektx_version" implementation 'androidx.legacy:legacy-support-v13:1.0.0' @@ -119,15 +119,15 @@ dependencies { testImplementation "junit:junit:$junit_version" testImplementation 'org.json:json:20211205' - testImplementation("org.mockito:mockito-core:${mockitoVersion}") { + testImplementation("org.mockito:mockito-core:${mockito_version}") { exclude group: 'net.bytebuddy', module: 'byte-buddy' exclude group: 'net.bytebuddy', module: 'byte-buddy-android' exclude group: 'net.bytebuddy', module: 'byte-buddy-agent' } // to fix org.mockito:mockito-core dependency issues, fixed in mockito 3+ - testImplementation "net.bytebuddy:byte-buddy:$byteBuddyVersion" - testImplementation "net.bytebuddy:byte-buddy-android:$byteBuddyVersion" - testImplementation "net.bytebuddy:byte-buddy-agent:$byteBuddyVersion" + testImplementation "net.bytebuddy:byte-buddy:$byteBuddy_version" + testImplementation "net.bytebuddy:byte-buddy-android:$byteBuddy_version" + testImplementation "net.bytebuddy:byte-buddy-agent:$byteBuddy_version" testImplementation "joda-time:joda-time:$jodatime_version" testImplementation('com.google.truth:truth:1.1.3') {