remove android_dependecies

This commit is contained in:
Milos Kozak 2023-10-16 15:20:50 +02:00
parent 2a782fa266
commit 71d8ded857
48 changed files with 95 additions and 92 deletions

View file

@ -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()}\"")

View file

@ -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"

View file

@ -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
}

View file

@ -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"
}

View file

@ -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
}
}

View file

@ -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)

View file

@ -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'
}
}

View file

@ -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 {

View file

@ -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"

View file

@ -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"

View file

@ -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 {

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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 {

View file

@ -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"