diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c34c6918c9..4ce07fba79 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -106,9 +106,9 @@ android { ndkVersion = Versions.ndkVersion defaultConfig { - multiDexEnabled = true - versionCode = Versions.versionCode - version = Versions.appVersion + minSdk = Versions.minSdk + targetSdk = Versions.targetSdk + buildConfigField("String", "VERSION", "\"$version\"") buildConfigField("String", "BUILDVERSION", "\"${generateGitBuild()}-${generateDate()}\"") buildConfigField("String", "REMOTE", "\"${generateGitRemote()}\"") diff --git a/buildSrc/src/main/kotlin/Libs.kt b/buildSrc/src/main/kotlin/Libs.kt index 20830f53dc..f975fa505d 100644 --- a/buildSrc/src/main/kotlin/Libs.kt +++ b/buildSrc/src/main/kotlin/Libs.kt @@ -5,15 +5,22 @@ object Libs { const val kotlin = "1.9.10" + const val stdlibJdk8 = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin" const val test = "org.jetbrains.kotlin:kotlin-test:$kotlin" } object KotlinX { private const val serialization = "1.6.0" + private const val coroutinesVersion = "1.7.3" const val serializationJson = "org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization" const val serializationProtobuf = "org.jetbrains.kotlinx:kotlinx-serialization-protobuf:$serialization" + const val coroutinesCore = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion" + const val coroutinesAndroid = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion" + const val coroutinesGuava = "org.jetbrains.kotlinx:kotlinx-coroutines-guava:$coroutinesVersion" + const val coroutinesPlayServices = "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutinesVersion" + const val datetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.4.1" } object AndroidX { @@ -22,6 +29,7 @@ object Libs { const val appCompat = "androidx.appcompat:appcompat:1.6.1" const val preference = "androidx.preference:preference-ktx:1.2.1" const val workRuntimeKtx = "androidx.work:work-runtime-ktx:2.8.1" + const val constraintLayout = "androidx.constraintlayout:constraintlayout:2.1.4" object Test { @@ -30,12 +38,28 @@ object Libs { const val rules = "androidx.test:rules:1.5.0" const val uiAutomator = "androidx.test.uiautomator:uiautomator:2.2.0" } + + object Wear { + + const val wear = "androidx.wear:wear:1.3.0" + const val tiles = "androidx.wear.tiles:tiles:1.2.0" + } } object Google { - object PlayServices { - const val measurementApi = "com.google.android.gms:play-services-measurement-api:21.3.0" + object Android { + object PlayServices { + + const val measurementApi = "com.google.android.gms:play-services-measurement-api:21.3.0" + const val wearable = "com.google.android.gms:play-services-wearable:18.1.0" + } + + object Wearable { + + const val wearable = "com.google.android.wearable:wearable:2.9.0" + const val wearableSupport = "com.google.android.support:wearable:2.9.0" + } } const val truth = "com.google.truth:truth:1.1.5" diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 6c93da38e7..f90a3d5a98 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -9,7 +9,9 @@ object Versions { const val compileSdk = 34 const val minSdk = 28 + const val targetSdk = 28 const val wearMinSdk = 26 + const val wearTargetSdk = 29 val javaVersion = JavaVersion.VERSION_11 } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/android-app-dependencies.gradle.kts b/buildSrc/src/main/kotlin/android-app-dependencies.gradle.kts index 393234ef08..2229c8d87e 100644 --- a/buildSrc/src/main/kotlin/android-app-dependencies.gradle.kts +++ b/buildSrc/src/main/kotlin/android-app-dependencies.gradle.kts @@ -6,9 +6,9 @@ plugins { android { compileSdk = Versions.compileSdk defaultConfig { - minSdk = 28 - @Suppress("DEPRECATION") - targetSdk = 28 + multiDexEnabled = true + versionCode = Versions.versionCode + version = Versions.appVersion testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/buildSrc/src/main/kotlin/android-module-dependencies.gradle.kts b/buildSrc/src/main/kotlin/android-module-dependencies.gradle.kts index 96a7bba23b..32fb83ce04 100644 --- a/buildSrc/src/main/kotlin/android-module-dependencies.gradle.kts +++ b/buildSrc/src/main/kotlin/android-module-dependencies.gradle.kts @@ -14,10 +14,6 @@ android { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } - buildFeatures { - viewBinding = true - } - buildTypes { named("release") { isMinifyEnabled = false @@ -59,9 +55,10 @@ android { } } - // disable for modules here buildFeatures { + // disable for modules here buildConfig = false + viewBinding = true } } diff --git a/core/interfaces/build.gradle.kts b/core/interfaces/build.gradle.kts index 23340e5179..cc0fd15617 100644 --- a/core/interfaces/build.gradle.kts +++ b/core/interfaces/build.gradle.kts @@ -33,7 +33,7 @@ dependencies { api(Libs.Logging.slf4jApi) api(Libs.Logging.logbackAndroid) - api(Libs.Google.PlayServices.measurementApi) + api(Libs.Google.Android.PlayServices.measurementApi) api(Libs.KotlinX.serializationJson) api(Libs.KotlinX.serializationProtobuf) diff --git a/core/main/android_dependencies.gradle b/core/main/android_dependencies.gradle deleted file mode 100644 index b89931830f..0000000000 --- a/core/main/android_dependencies.gradle +++ /dev/null @@ -1,37 +0,0 @@ -android { - compileSdk 34 - defaultConfig { - minSdkVersion 28 - targetSdkVersion 28 - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - } - - buildFeatures { - viewBinding true - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - - sourceSets { - main { - jniLibs.srcDirs = ['src/main/jniLibs'] - } - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 - } - - lint { - checkReleaseBuilds false - disable 'MissingTranslation' - disable 'ExtraTranslation' - } -} \ No newline at end of file diff --git a/core/main/android_module_dependencies.gradle b/core/main/android_module_dependencies.gradle index 8ccf62d869..f28776b8b1 100644 --- a/core/main/android_module_dependencies.gradle +++ b/core/main/android_module_dependencies.gradle @@ -1,4 +1,11 @@ android { + compileSdk 34 + defaultConfig { + minSdkVersion 28 + targetSdkVersion 28 + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } flavorDimensions = ["standard"] productFlavors { @@ -19,8 +26,33 @@ android { // disable for modules here buildFeatures { + viewBinding = true buildConfig = false } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + + sourceSets { + main { + jniLibs.srcDirs = ['src/main/jniLibs'] + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 + } + + lint { + checkReleaseBuilds false + disable 'MissingTranslation' + disable 'ExtraTranslation' + } } dependencies { diff --git a/core/main/build.gradle b/core/main/build.gradle index fd9df93b21..ea5c49ec5b 100644 --- a/core/main/build.gradle +++ b/core/main/build.gradle @@ -6,7 +6,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/core/nssdk/build.gradle b/core/nssdk/build.gradle index 1a9d40e8db..a4fbc5a740 100644 --- a/core/nssdk/build.gradle +++ b/core/nssdk/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlinx-serialization' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/core/ui/build.gradle b/core/ui/build.gradle index f8d0c810f6..d5ed2279d6 100644 --- a/core/ui/build.gradle +++ b/core/ui/build.gradle @@ -4,7 +4,6 @@ plugins { id 'kotlin-kapt' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" android { diff --git a/core/utils/build.gradle b/core/utils/build.gradle index 02d06b54d7..5afcf3b70c 100644 --- a/core/utils/build.gradle +++ b/core/utils/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/core/validators/build.gradle b/core/validators/build.gradle index ba7c4b77b2..7b98cfe3d3 100644 --- a/core/validators/build.gradle +++ b/core/validators/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/database/entities/build.gradle b/database/entities/build.gradle index 248d1db0c6..eb9e59ed72 100644 --- a/database/entities/build.gradle +++ b/database/entities/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/database/impl/build.gradle b/database/impl/build.gradle index ae471b1193..5c830ec3c4 100644 --- a/database/impl/build.gradle +++ b/database/impl/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" apply from: "${project.rootDir}/core/main/jacoco_global.gradle" diff --git a/implementation/build.gradle b/implementation/build.gradle index ac3a14775f..91e04b3be1 100644 --- a/implementation/build.gradle +++ b/implementation/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" diff --git a/insight/build.gradle b/insight/build.gradle index 78ebd94579..95fd95d085 100644 --- a/insight/build.gradle +++ b/insight/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/plugins/aps/build.gradle b/plugins/aps/build.gradle index f7b1eef555..51bfc41d02 100644 --- a/plugins/aps/build.gradle +++ b/plugins/aps/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" diff --git a/plugins/automation/build.gradle b/plugins/automation/build.gradle index 06d03961cc..acf1ff0282 100644 --- a/plugins/automation/build.gradle +++ b/plugins/automation/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/plugins/configuration/build.gradle b/plugins/configuration/build.gradle index cb33277adb..b4272f7011 100644 --- a/plugins/configuration/build.gradle +++ b/plugins/configuration/build.gradle @@ -6,7 +6,6 @@ plugins { id 'kotlin-parcelize' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/plugins/constraints/build.gradle b/plugins/constraints/build.gradle index e85a73b018..7bfbc09f70 100644 --- a/plugins/constraints/build.gradle +++ b/plugins/constraints/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" diff --git a/plugins/insulin/build.gradle b/plugins/insulin/build.gradle index e934f67d54..68909827ec 100644 --- a/plugins/insulin/build.gradle +++ b/plugins/insulin/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/plugins/main/build.gradle b/plugins/main/build.gradle index fa34723f9c..488b128ba5 100644 --- a/plugins/main/build.gradle +++ b/plugins/main/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" diff --git a/plugins/sensitivity/build.gradle b/plugins/sensitivity/build.gradle index d33ef78ef0..76cc87e9d1 100644 --- a/plugins/sensitivity/build.gradle +++ b/plugins/sensitivity/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/plugins/smoothing/build.gradle b/plugins/smoothing/build.gradle index c910ef3dbd..6001033f59 100644 --- a/plugins/smoothing/build.gradle +++ b/plugins/smoothing/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/plugins/source/build.gradle b/plugins/source/build.gradle index 95d4773913..96e0678b7f 100644 --- a/plugins/source/build.gradle +++ b/plugins/source/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/plugins/sync/build.gradle b/plugins/sync/build.gradle index dc8826f9ba..bf7bf2ad92 100644 --- a/plugins/sync/build.gradle +++ b/plugins/sync/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" diff --git a/pump/combo/build.gradle b/pump/combo/build.gradle index 53b9d9e7bd..30b6112f1a 100644 --- a/pump/combo/build.gradle +++ b/pump/combo/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/pump/combov2/build.gradle b/pump/combov2/build.gradle index 902108af6a..e1bd39696a 100644 --- a/pump/combov2/build.gradle +++ b/pump/combov2/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" apply from: "${project.rootDir}/core/main/jacoco_global.gradle" diff --git a/pump/combov2/comboctl/build.gradle b/pump/combov2/comboctl/build.gradle index e999327421..c3744c2d9f 100644 --- a/pump/combov2/comboctl/build.gradle +++ b/pump/combov2/comboctl/build.gradle @@ -4,7 +4,6 @@ plugins { id 'kotlin-kapt' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" apply from: "${project.rootDir}/core/main/jacoco_global.gradle" diff --git a/pump/dana/build.gradle b/pump/dana/build.gradle index 3c44880ef9..9f985c5304 100644 --- a/pump/dana/build.gradle +++ b/pump/dana/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/pump/danar/build.gradle b/pump/danar/build.gradle index 18ed198b15..04b0b7415d 100644 --- a/pump/danar/build.gradle +++ b/pump/danar/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/pump/danars/build.gradle b/pump/danars/build.gradle index d9dc3a2aab..472aa0545c 100644 --- a/pump/danars/build.gradle +++ b/pump/danars/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/pump/diaconn/build.gradle b/pump/diaconn/build.gradle index 531cc1c38e..c49e08945e 100644 --- a/pump/diaconn/build.gradle +++ b/pump/diaconn/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/pump/eopatch/build.gradle b/pump/eopatch/build.gradle index 281a2187b4..6c35f41c74 100644 --- a/pump/eopatch/build.gradle +++ b/pump/eopatch/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" apply from: "${project.rootDir}/core/main/jacoco_global.gradle" diff --git a/pump/medtronic/build.gradle b/pump/medtronic/build.gradle index b71f2603dc..fc3de1bb8c 100644 --- a/pump/medtronic/build.gradle +++ b/pump/medtronic/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/pump/medtrum/build.gradle b/pump/medtrum/build.gradle index f60bcbafb6..afb4c23eb0 100644 --- a/pump/medtrum/build.gradle +++ b/pump/medtrum/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/pump/omnipod-common/build.gradle b/pump/omnipod-common/build.gradle index 2258b47333..3acdc8943a 100644 --- a/pump/omnipod-common/build.gradle +++ b/pump/omnipod-common/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/pump/omnipod-dash/build.gradle b/pump/omnipod-dash/build.gradle index 8faa4d59a9..d414b36f9c 100644 --- a/pump/omnipod-dash/build.gradle +++ b/pump/omnipod-dash/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/pump/omnipod-eros/build.gradle b/pump/omnipod-eros/build.gradle index 64593ca2f2..bed6dd815c 100644 --- a/pump/omnipod-eros/build.gradle +++ b/pump/omnipod-eros/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/pump/pump-common/build.gradle b/pump/pump-common/build.gradle index 1eac553e61..0844ae07a0 100644 --- a/pump/pump-common/build.gradle +++ b/pump/pump-common/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/pump/rileylink/build.gradle b/pump/rileylink/build.gradle index 4fb93e7916..773f5663f7 100644 --- a/pump/rileylink/build.gradle +++ b/pump/rileylink/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/pump/virtual/build.gradle b/pump/virtual/build.gradle index 3329ea7b62..d5c8563d53 100644 --- a/pump/virtual/build.gradle +++ b/pump/virtual/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/shared/impl/build.gradle b/shared/impl/build.gradle index e67cbd5e0d..9c5e3762a3 100644 --- a/shared/impl/build.gradle +++ b/shared/impl/build.gradle @@ -6,7 +6,6 @@ plugins { id 'kotlinx-serialization' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/shared/tests/build.gradle b/shared/tests/build.gradle index 00c24c1373..43bce750c4 100644 --- a/shared/tests/build.gradle +++ b/shared/tests/build.gradle @@ -6,7 +6,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/allopen_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" diff --git a/ui/build.gradle b/ui/build.gradle index c75e9364c1..27e4a0fe55 100644 --- a/ui/build.gradle +++ b/ui/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" apply from: "${project.rootDir}/core/main/jacoco_global.gradle" diff --git a/wear/build.gradle b/wear/build.gradle index 2355f09aa1..adce2fa861 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -17,7 +17,6 @@ plugins { } apply from: "${project.rootDir}/core/main/test_dependencies.gradle" -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/jacoco_global.gradle" @@ -43,6 +42,8 @@ def generateGitBuild = { -> } android { + namespace 'app.aaps.wear' + compileSdk 34 defaultConfig { @@ -81,7 +82,30 @@ android { versionName version + "-aapsclient" } } - namespace 'app.aaps.wear' + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } + + sourceSets { + main { + jniLibs.srcDirs = ['src/main/jniLibs'] + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 + } + + lint { + checkReleaseBuilds false + disable 'MissingTranslation' + disable 'ExtraTranslation' + } } allprojects { diff --git a/workflow/build.gradle b/workflow/build.gradle index db01daed40..50c3189809 100644 --- a/workflow/build.gradle +++ b/workflow/build.gradle @@ -5,7 +5,6 @@ plugins { id 'kotlin-allopen' } -apply from: "${project.rootDir}/core/main/android_dependencies.gradle" apply from: "${project.rootDir}/core/main/android_module_dependencies.gradle" apply from: "${project.rootDir}/core/main/test_dependencies.gradle" apply from: "${project.rootDir}/core/main/jacoco_global.gradle"