diff --git a/app/build.gradle b/app/build.gradle index 4b27595647..a86c726b65 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services' apply plugin: 'com.hiya.jacoco-android' apply plugin: 'com.google.firebase.crashlytics' -apply from: "${project.rootDir}/gradle/android_dependencies.gradle" -apply from: "${project.rootDir}/gradle/jacoco_global.gradle" +apply from: "${project.rootDir}/core/android_dependencies.gradle" +apply from: "${project.rootDir}/core/jacoco_global.gradle" repositories { mavenCentral() @@ -204,7 +204,7 @@ dependencies { kapt "com.google.dagger:dagger-compiler:$dagger_version" } -apply from: "${project.rootDir}/gradle/test_dependencies.gradle" +apply from: "${project.rootDir}/core/test_dependencies.gradle" /* diff --git a/automation/build.gradle b/automation/build.gradle index b73447296f..79564845d5 100644 --- a/automation/build.gradle +++ b/automation/build.gradle @@ -4,10 +4,10 @@ apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-allopen' apply plugin: 'com.hiya.jacoco-android' -apply from: "${project.rootDir}/gradle/android_dependencies.gradle" -apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle" -apply from: "${project.rootDir}/gradle/test_dependencies.gradle" -apply from: "${project.rootDir}/gradle/jacoco_global.gradle" +apply from: "${project.rootDir}/core/android_dependencies.gradle" +apply from: "${project.rootDir}/core/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/test_dependencies.gradle" +apply from: "${project.rootDir}/core/jacoco_global.gradle" dependencies { diff --git a/build.gradle b/build.gradle index b83b7308db..6840a215f0 100644 --- a/build.gradle +++ b/build.gradle @@ -87,7 +87,7 @@ allprojects { } } -apply from: 'gradle/jacoco_project.gradle' +apply from: 'jacoco_project.gradle' task clean(type: Delete) { delete rootProject.buildDir diff --git a/combo/build.gradle b/combo/build.gradle index 885f8dc936..7605e4667d 100644 --- a/combo/build.gradle +++ b/combo/build.gradle @@ -4,10 +4,10 @@ apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-allopen' apply plugin: 'com.hiya.jacoco-android' -apply from: "${project.rootDir}/gradle/android_dependencies.gradle" -apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle" -apply from: "${project.rootDir}/gradle/test_dependencies.gradle" -apply from: "${project.rootDir}/gradle/jacoco_global.gradle" +apply from: "${project.rootDir}/core/android_dependencies.gradle" +apply from: "${project.rootDir}/core/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/test_dependencies.gradle" +apply from: "${project.rootDir}/core/jacoco_global.gradle" dependencies { implementation project(':core') diff --git a/gradle/android_dependencies.gradle b/core/android_dependencies.gradle similarity index 100% rename from gradle/android_dependencies.gradle rename to core/android_dependencies.gradle diff --git a/gradle/android_module_dependencies.gradle b/core/android_module_dependencies.gradle similarity index 100% rename from gradle/android_module_dependencies.gradle rename to core/android_module_dependencies.gradle diff --git a/core/build.gradle b/core/build.gradle index abc0a93709..b3fef255db 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -6,10 +6,10 @@ apply plugin: 'kotlin-allopen' apply plugin: 'com.hiya.jacoco-android' apply from: 'core_dependencies.gradle' -apply from: "${project.rootDir}/gradle/android_dependencies.gradle" -apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle" -apply from: "${project.rootDir}/gradle/test_dependencies.gradle" -apply from: "${project.rootDir}/gradle/jacoco_global.gradle" +apply from: "${project.rootDir}/core/android_dependencies.gradle" +apply from: "${project.rootDir}/core/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/test_dependencies.gradle" +apply from: "${project.rootDir}/core/jacoco_global.gradle" dependencies { implementation project(':shared') diff --git a/gradle/jacoco_global.gradle b/core/jacoco_global.gradle similarity index 100% rename from gradle/jacoco_global.gradle rename to core/jacoco_global.gradle diff --git a/gradle/test_dependencies.gradle b/core/test_dependencies.gradle similarity index 100% rename from gradle/test_dependencies.gradle rename to core/test_dependencies.gradle diff --git a/dana/build.gradle b/dana/build.gradle index 2d529842d8..64bc021517 100644 --- a/dana/build.gradle +++ b/dana/build.gradle @@ -4,10 +4,10 @@ apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-allopen' apply plugin: 'com.hiya.jacoco-android' -apply from: "${project.rootDir}/gradle/android_dependencies.gradle" -apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle" -apply from: "${project.rootDir}/gradle/test_dependencies.gradle" -apply from: "${project.rootDir}/gradle/jacoco_global.gradle" +apply from: "${project.rootDir}/core/android_dependencies.gradle" +apply from: "${project.rootDir}/core/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/test_dependencies.gradle" +apply from: "${project.rootDir}/core/jacoco_global.gradle" android { defaultConfig { diff --git a/danar/build.gradle b/danar/build.gradle index f3350ecfd0..6a273260c5 100644 --- a/danar/build.gradle +++ b/danar/build.gradle @@ -4,10 +4,10 @@ apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-allopen' apply plugin: 'com.hiya.jacoco-android' -apply from: "${project.rootDir}/gradle/android_dependencies.gradle" -apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle" -apply from: "${project.rootDir}/gradle/test_dependencies.gradle" -apply from: "${project.rootDir}/gradle/jacoco_global.gradle" +apply from: "${project.rootDir}/core/android_dependencies.gradle" +apply from: "${project.rootDir}/core/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/test_dependencies.gradle" +apply from: "${project.rootDir}/core/jacoco_global.gradle" dependencies { implementation project(':core') diff --git a/danars/build.gradle b/danars/build.gradle index 0c93c75c66..96b60d2931 100644 --- a/danars/build.gradle +++ b/danars/build.gradle @@ -4,10 +4,10 @@ apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-allopen' apply plugin: 'com.hiya.jacoco-android' -apply from: "${project.rootDir}/gradle/android_dependencies.gradle" -apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle" -apply from: "${project.rootDir}/gradle/test_dependencies.gradle" -apply from: "${project.rootDir}/gradle/jacoco_global.gradle" +apply from: "${project.rootDir}/core/android_dependencies.gradle" +apply from: "${project.rootDir}/core/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/test_dependencies.gradle" +apply from: "${project.rootDir}/core/jacoco_global.gradle" android { ndkVersion "21.1.6352462" diff --git a/database/build.gradle b/database/build.gradle index a524196d9e..d5bb7026e9 100644 --- a/database/build.gradle +++ b/database/build.gradle @@ -3,8 +3,8 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-allopen' -apply from: "${project.rootDir}/gradle/android_dependencies.gradle" -apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/android_dependencies.gradle" +apply from: "${project.rootDir}/core/android_module_dependencies.gradle" android { defaultConfig { diff --git a/diaconn/build.gradle b/diaconn/build.gradle index 2d529842d8..64bc021517 100644 --- a/diaconn/build.gradle +++ b/diaconn/build.gradle @@ -4,10 +4,10 @@ apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-allopen' apply plugin: 'com.hiya.jacoco-android' -apply from: "${project.rootDir}/gradle/android_dependencies.gradle" -apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle" -apply from: "${project.rootDir}/gradle/test_dependencies.gradle" -apply from: "${project.rootDir}/gradle/jacoco_global.gradle" +apply from: "${project.rootDir}/core/android_dependencies.gradle" +apply from: "${project.rootDir}/core/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/test_dependencies.gradle" +apply from: "${project.rootDir}/core/jacoco_global.gradle" android { defaultConfig { diff --git a/insight/build.gradle b/insight/build.gradle index 2d529842d8..64bc021517 100644 --- a/insight/build.gradle +++ b/insight/build.gradle @@ -4,10 +4,10 @@ apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-allopen' apply plugin: 'com.hiya.jacoco-android' -apply from: "${project.rootDir}/gradle/android_dependencies.gradle" -apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle" -apply from: "${project.rootDir}/gradle/test_dependencies.gradle" -apply from: "${project.rootDir}/gradle/jacoco_global.gradle" +apply from: "${project.rootDir}/core/android_dependencies.gradle" +apply from: "${project.rootDir}/core/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/test_dependencies.gradle" +apply from: "${project.rootDir}/core/jacoco_global.gradle" android { defaultConfig { diff --git a/gradle/jacoco_project.gradle b/jacoco_project.gradle similarity index 100% rename from gradle/jacoco_project.gradle rename to jacoco_project.gradle diff --git a/medtronic/build.gradle b/medtronic/build.gradle index 078dae6099..7b00d238c8 100644 --- a/medtronic/build.gradle +++ b/medtronic/build.gradle @@ -4,10 +4,10 @@ apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-allopen' apply plugin: 'com.hiya.jacoco-android' -apply from: "${project.rootDir}/gradle/android_dependencies.gradle" -apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle" -apply from: "${project.rootDir}/gradle/test_dependencies.gradle" -apply from: "${project.rootDir}/gradle/jacoco_global.gradle" +apply from: "${project.rootDir}/core/android_dependencies.gradle" +apply from: "${project.rootDir}/core/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/test_dependencies.gradle" +apply from: "${project.rootDir}/core/jacoco_global.gradle" dependencies { implementation project(':core') diff --git a/omnipod-common/build.gradle b/omnipod-common/build.gradle index 8cd557a806..5a2e5bfac4 100644 --- a/omnipod-common/build.gradle +++ b/omnipod-common/build.gradle @@ -5,10 +5,10 @@ apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-allopen' apply plugin: 'com.hiya.jacoco-android' -apply from: "${project.rootDir}/gradle/android_dependencies.gradle" -apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle" -apply from: "${project.rootDir}/gradle/test_dependencies.gradle" -apply from: "${project.rootDir}/gradle/jacoco_global.gradle" +apply from: "${project.rootDir}/core/android_dependencies.gradle" +apply from: "${project.rootDir}/core/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/test_dependencies.gradle" +apply from: "${project.rootDir}/core/jacoco_global.gradle" dependencies { implementation project(':core') diff --git a/omnipod-dash/build.gradle b/omnipod-dash/build.gradle index 4bfced3795..c6c5734f70 100644 --- a/omnipod-dash/build.gradle +++ b/omnipod-dash/build.gradle @@ -6,10 +6,10 @@ apply plugin: 'com.hiya.jacoco-android' apply plugin: "io.gitlab.arturbosch.detekt" // TODO move to `subprojects` section in global build.gradle apply plugin: "org.jlleitschuh.gradle.ktlint" // TODO move to `subprojects` section in global build.gradle -apply from: "${project.rootDir}/gradle/android_dependencies.gradle" -apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle" -apply from: "${project.rootDir}/gradle/test_dependencies.gradle" -apply from: "${project.rootDir}/gradle/jacoco_global.gradle" +apply from: "${project.rootDir}/core/android_dependencies.gradle" +apply from: "${project.rootDir}/core/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/test_dependencies.gradle" +apply from: "${project.rootDir}/core/jacoco_global.gradle" detekt { // TODO move to `subprojects` section in global build.gradle toolVersion = "1.15.0-RC2" diff --git a/omnipod-eros/build.gradle b/omnipod-eros/build.gradle index 0af50ce411..9bc119cef9 100644 --- a/omnipod-eros/build.gradle +++ b/omnipod-eros/build.gradle @@ -4,10 +4,10 @@ apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-allopen' apply plugin: 'com.hiya.jacoco-android' -apply from: "${project.rootDir}/gradle/android_dependencies.gradle" -apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle" -apply from: "${project.rootDir}/gradle/test_dependencies.gradle" -apply from: "${project.rootDir}/gradle/jacoco_global.gradle" +apply from: "${project.rootDir}/core/android_dependencies.gradle" +apply from: "${project.rootDir}/core/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/test_dependencies.gradle" +apply from: "${project.rootDir}/core/jacoco_global.gradle" android { defaultConfig { diff --git a/openhumans/build.gradle b/openhumans/build.gradle index b73447296f..79564845d5 100644 --- a/openhumans/build.gradle +++ b/openhumans/build.gradle @@ -4,10 +4,10 @@ apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-allopen' apply plugin: 'com.hiya.jacoco-android' -apply from: "${project.rootDir}/gradle/android_dependencies.gradle" -apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle" -apply from: "${project.rootDir}/gradle/test_dependencies.gradle" -apply from: "${project.rootDir}/gradle/jacoco_global.gradle" +apply from: "${project.rootDir}/core/android_dependencies.gradle" +apply from: "${project.rootDir}/core/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/test_dependencies.gradle" +apply from: "${project.rootDir}/core/jacoco_global.gradle" dependencies { diff --git a/pump-common/build.gradle b/pump-common/build.gradle index 724c2e8e33..7f0a8b7757 100644 --- a/pump-common/build.gradle +++ b/pump-common/build.gradle @@ -4,10 +4,10 @@ apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-allopen' apply plugin: 'com.hiya.jacoco-android' -apply from: "${project.rootDir}/gradle/android_dependencies.gradle" -apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle" -apply from: "${project.rootDir}/gradle/test_dependencies.gradle" -apply from: "${project.rootDir}/gradle/jacoco_global.gradle" +apply from: "${project.rootDir}/core/android_dependencies.gradle" +apply from: "${project.rootDir}/core/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/test_dependencies.gradle" +apply from: "${project.rootDir}/core/jacoco_global.gradle" dependencies { implementation project(':core') diff --git a/rileylink/build.gradle b/rileylink/build.gradle index 762d9f28e6..0647e1d938 100644 --- a/rileylink/build.gradle +++ b/rileylink/build.gradle @@ -4,10 +4,10 @@ apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-allopen' apply plugin: 'com.hiya.jacoco-android' -apply from: "${project.rootDir}/gradle/android_dependencies.gradle" -apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle" -apply from: "${project.rootDir}/gradle/test_dependencies.gradle" -apply from: "${project.rootDir}/gradle/jacoco_global.gradle" +apply from: "${project.rootDir}/core/android_dependencies.gradle" +apply from: "${project.rootDir}/core/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/test_dependencies.gradle" +apply from: "${project.rootDir}/core/jacoco_global.gradle" dependencies { implementation project(':core') diff --git a/shared/build.gradle b/shared/build.gradle index c4f3cfb88a..3cc083e1e3 100644 --- a/shared/build.gradle +++ b/shared/build.gradle @@ -5,10 +5,10 @@ apply plugin: 'kotlin-allopen' apply plugin: 'com.hiya.jacoco-android' apply plugin: 'kotlinx-serialization' -apply from: "${project.rootDir}/gradle/android_dependencies.gradle" -apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle" -apply from: "${project.rootDir}/gradle/test_dependencies.gradle" -apply from: "${project.rootDir}/gradle/jacoco_global.gradle" +apply from: "${project.rootDir}/core/android_dependencies.gradle" +apply from: "${project.rootDir}/core/android_module_dependencies.gradle" +apply from: "${project.rootDir}/core/test_dependencies.gradle" +apply from: "${project.rootDir}/core/jacoco_global.gradle" android { defaultConfig { diff --git a/wear/build.gradle b/wear/build.gradle index 2bee9762de..b05c01ffb9 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -16,9 +16,9 @@ apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-allopen' apply plugin: 'com.hiya.jacoco-android' -apply from: "${project.rootDir}/gradle/test_dependencies.gradle" -apply from: "${project.rootDir}/gradle/android_dependencies.gradle" -apply from: "${project.rootDir}/gradle/jacoco_global.gradle" +apply from: "${project.rootDir}/core/test_dependencies.gradle" +apply from: "${project.rootDir}/core/android_dependencies.gradle" +apply from: "${project.rootDir}/core/jacoco_global.gradle" ext {