dependency management

2 years ago · 5d6c99581f
parent e80f2904e1
commit 5d6c99581f
14 changed files with 89 additions and 279 deletions
--- a/AppFrame/build.gradle
+++ b/AppFrame/build.gradle
@ -1,30 +1,8 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-kapt'

 android {
-  compileSdkVersion libs.versions.compilesdk.get().toInteger()
-  buildToolsVersion libs.versions.buildToolsVersion.get()
-
-  defaultConfig {
-    minSdkVersion libs.versions.minSdk.get().toInteger()
-    targetSdkVersion libs.versions.targetsdk.get().toInteger()
-
-    testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-  }
-  buildTypes {
-    release {
-      minifyEnabled false
-      proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-    }
-  }
  dataBinding {
    enabled = true
  }
-  lintOptions {
-    abortOnError false
-  }
-
 }

 dependencies {
--- a/Aria/build.gradle
+++ b/Aria/build.gradle
@ -1,26 +1,4 @@
-plugins {
-  id 'com.android.library'
-  id 'org.jetbrains.kotlin.android'
-}
-
-android {
-  compileSdkVersion libs.versions.compilesdk.get().toInteger()
-  buildToolsVersion libs.versions.buildToolsVersion.get()

-  defaultConfig {
-    minSdkVersion libs.versions.minSdk.get().toInteger()
-    targetSdkVersion libs.versions.targetsdk.get().toInteger()
-  }
-  buildTypes {
-    release {
-      minifyEnabled false
-      proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-    }
-  }
-  lintOptions {
-    abortOnError false
-  }
-}
 dependencies {
  implementation fileTree(include: ['*.jar'], dir: 'libs')
  testImplementation(libs.bundles.android.test)
--- a/AriaAnnotations/build.gradle
+++ b/AriaAnnotations/build.gradle
@ -1,12 +1,3 @@
-apply plugin: 'java'
-
-tasks.withType(JavaCompile) {
-  options.encoding = "UTF-8"
-}
-
-sourceCompatibility = JavaVersion.VERSION_1_7
-targetCompatibility = JavaVersion.VERSION_1_7
-
 dependencies {
 //  compile fileTree(dir: 'libs', include: ['*.jar'])
 }
--- a/AriaCompiler/build.gradle
+++ b/AriaCompiler/build.gradle
@ -1,11 +1,3 @@
-apply plugin: 'java'
-
-tasks.withType(JavaCompile) {
-  options.encoding = "UTF-8"
-}
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-
 dependencies {
  implementation fileTree(include: ['*.jar'], dir: 'libs')
  implementation 'com.google.auto:auto-common:1.2'
--- a/FtpComponent/build.gradle
+++ b/FtpComponent/build.gradle
@ -1,32 +1,3 @@
-plugins {
-  id 'com.android.library'
-  id 'org.jetbrains.kotlin.android'
-}
-
-android {
-  compileSdkVersion libs.versions.compilesdk.get().toInteger()
-  buildToolsVersion libs.versions.buildToolsVersion.get()
-
-  defaultConfig {
-    minSdkVersion libs.versions.minSdk.get().toInteger()
-    targetSdkVersion libs.versions.targetsdk.get().toInteger()
-
-    testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    consumerProguardFiles 'consumer-rules.pro'
-  }
-
-  buildTypes {
-    release {
-      minifyEnabled false
-      proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-    }
-  }
-  lintOptions {
-    abortOnError false
-  }
-
-}
-
 dependencies {
  implementation fileTree(dir: 'libs', include: ['*.jar'])

--- a/Http/build.gradle
+++ b/Http/build.gradle
@ -1,32 +1,3 @@
-plugins {
-  id 'com.android.library'
-  id 'org.jetbrains.kotlin.android'
-  id 'kotlin-kapt'
-}
-
-android {
-  compileSdkVersion libs.versions.compilesdk.get().toInteger()
-  buildToolsVersion libs.versions.buildToolsVersion.get()
-
-  defaultConfig {
-    minSdkVersion libs.versions.minSdk.get().toInteger()
-    targetSdkVersion libs.versions.targetsdk.get().toInteger()
-
-    consumerProguardFiles 'consumer-rules.pro'
-  }
-
-  buildTypes {
-    release {
-      minifyEnabled false
-      proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-    }
-  }
-  lintOptions {
-    abortOnError false
-  }
-
-}
-
 dependencies {
  implementation fileTree(dir: 'libs', include: ['*.jar'])

--- a/M3U8Component/build.gradle
+++ b/M3U8Component/build.gradle
@ -1,32 +1,3 @@
-plugins {
-  id 'com.android.library'
-  id 'org.jetbrains.kotlin.android'
-}
-
-android {
-  compileSdkVersion libs.versions.compilesdk.get().toInteger()
-  buildToolsVersion libs.versions.buildToolsVersion.get()
-
-  defaultConfig {
-    minSdkVersion libs.versions.minSdk.get().toInteger()
-    targetSdkVersion libs.versions.targetsdk.get().toInteger()
-
-    testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    consumerProguardFiles 'consumer-rules.pro'
-  }
-
-  buildTypes {
-    release {
-      minifyEnabled false
-      proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-    }
-  }
-  lintOptions {
-    abortOnError false
-  }
-
-}
-
 dependencies {
  implementation fileTree(dir: 'libs', include: ['*.jar'])

--- a/PublicComponent/build.gradle
+++ b/PublicComponent/build.gradle
@ -1,33 +1,3 @@
-plugins {
-  id 'com.android.library'
-  id 'org.jetbrains.kotlin.android'
-  id 'kotlin-kapt'
-}
-
-android {
-  compileSdkVersion libs.versions.compilesdk.get().toInteger()
-  buildToolsVersion libs.versions.buildToolsVersion.get()
-
-  defaultConfig {
-    minSdkVersion libs.versions.minSdk.get().toInteger()
-    targetSdkVersion libs.versions.targetsdk.get().toInteger()
-
-    testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    consumerProguardFiles 'consumer-rules.pro'
-  }
-
-  buildTypes {
-    release {
-      minifyEnabled false
-      proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-    }
-  }
-
-  lintOptions {
-    abortOnError false
-  }
-}
-
 dependencies {
  implementation fileTree(dir: 'libs', include: ['*.jar'])
  api project(path: ':AriaAnnotations')
--- a/Queue/build.gradle
+++ b/Queue/build.gradle
@ -1,33 +1,3 @@
-plugins {
-  id 'com.android.library'
-  id 'org.jetbrains.kotlin.android'
-}
-
-android {
-
-  compileSdkVersion libs.versions.compilesdk.get().toInteger()
-  buildToolsVersion libs.versions.buildToolsVersion.get()
-
-  namespace 'com.arialyy.aria.queue'
-
-  defaultConfig {
-    minSdkVersion libs.versions.minSdk.get().toInteger()
-    targetSdkVersion libs.versions.targetsdk.get().toInteger()
-
-    consumerProguardFiles 'consumer-rules.pro'
-  }
-
-  buildTypes {
-    release {
-      minifyEnabled false
-      proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-    }
-  }
-  lintOptions {
-    abortOnError false
-  }
-}
-
 dependencies {
  implementation fileTree(dir: 'libs', include: ['*.jar'])

--- a/SFtpComponent/build.gradle
+++ b/SFtpComponent/build.gradle
@ -1,32 +1,3 @@
-plugins {
-  id 'com.android.library'
-  id 'org.jetbrains.kotlin.android'
-}
-
-android {
-  compileSdkVersion libs.versions.compilesdk.get().toInteger()
-  buildToolsVersion libs.versions.buildToolsVersion.get()
-
-  defaultConfig {
-    minSdkVersion libs.versions.minSdk.get().toInteger()
-    targetSdkVersion libs.versions.targetsdk.get().toInteger()
-
-    testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    consumerProguardFiles 'consumer-rules.pro'
-  }
-
-  buildTypes {
-    release {
-      minifyEnabled false
-      proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-    }
-  }
-  lintOptions {
-    abortOnError false
-  }
-
-}
-
 dependencies {
  implementation fileTree(dir: 'libs', include: ['*.jar'])

--- a/Schedulers/build.gradle
+++ b/Schedulers/build.gradle
@ -1,33 +1,3 @@
-plugins {
-  id 'com.android.library'
-  id 'org.jetbrains.kotlin.android'
-}
-
-android {
-
-  compileSdkVersion libs.versions.compilesdk.get().toInteger()
-  buildToolsVersion libs.versions.buildToolsVersion.get()
-
-  namespace 'com.arialyy.aria.schedulers'
-
-  defaultConfig {
-    minSdkVersion libs.versions.minSdk.get().toInteger()
-    targetSdkVersion libs.versions.targetsdk.get().toInteger()
-
-    consumerProguardFiles 'consumer-rules.pro'
-  }
-
-  buildTypes {
-    release {
-      minifyEnabled false
-      proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-    }
-  }
-  lintOptions {
-    abortOnError false
-  }
-}
-
 dependencies {
  implementation fileTree(dir: 'libs', include: ['*.jar'])

--- a/androidComponent.gradle
+++ b/androidComponent.gradle
@ -0,0 +1,27 @@
+apply {
+  plugin "com.android.library"
+  plugin "org.jetbrains.kotlin.android"
+  plugin "kotlin-kapt"
+}
+
+android {
+  compileSdkVersion libs.versions.compilesdk.get().toInteger()
+  buildToolsVersion libs.versions.buildToolsVersion.get()
+
+  defaultConfig {
+    minSdkVersion libs.versions.minSdk.get().toInteger()
+    targetSdkVersion libs.versions.targetsdk.get().toInteger()
+
+    consumerProguardFiles 'consumer-rules.pro'
+  }
+
+  buildTypes {
+    release {
+      minifyEnabled false
+      proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+    }
+  }
+  lintOptions {
+    abortOnError false
+  }
+}
--- a/javaComponent.gradle
+++ b/javaComponent.gradle
@ -0,0 +1,26 @@
+apply {
+  plugin "com.android.library"
+  plugin "org.jetbrains.kotlin.android"
+}
+
+android {
+  compileSdkVersion libs.versions.compilesdk.get().toInteger()
+  buildToolsVersion libs.versions.buildToolsVersion.get()
+
+  defaultConfig {
+    minSdkVersion libs.versions.minSdk.get().toInteger()
+    targetSdkVersion libs.versions.targetsdk.get().toInteger()
+
+    consumerProguardFiles 'consumer-rules.pro'
+  }
+
+  buildTypes {
+    release {
+      minifyEnabled false
+      proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+    }
+  }
+  lintOptions {
+    abortOnError false
+  }
+}
--- a/settings.gradle
+++ b/settings.gradle
@ -25,17 +25,41 @@ dependencyResolutionManagement {

  versionCatalogs {
    libs {
-      //      from("com.lyy.kpa.version:catalog:0.0.1")
      from(files('libs.versions.toml'))
-      // 我们也可以重写覆盖catalog中的groovy版本
-      //      version("groovy", "3.0.6")
+    }
  }
 }

+gradle.rootProject {
+  it.subprojects { sub ->
+    beforeEvaluate {
+      print(sub.name)
+      switch (sub.name) {
+        case "app":
+          break
+        case "AriaAnnotations":
+        case "AriaCompiler":
+          sub.apply {
+            from "${project.rootDir.path}/javaComponent.gradle"
+          }
+          break
+        default:
+          sub.apply {
+            from "${project.rootDir.path}/androidComponent.gradle"
+          }
+          sub.android.namespace = "com.lyy.dua.${sub.name}"
+          break
+      }
+    }
+  }
 }

-include ':app', ':Aria', ':AriaAnnotations', ':AriaCompiler', ':AppFrame', ':Http', ':M3U8Component', ':SFtpComponent',
-    ':FtpComponent', ':PublicComponent'
+def componentList = [':app', ':Aria', ':AriaAnnotations', ':AriaCompiler',
+    ':AppFrame', ':Http', ':M3U8Component', ':SFtpComponent', ':FtpComponent', ':PublicComponent',
+    ':Queue', ':Schedulers'
+]
+
+componentList.forEach {
+  include(it)
+}
 rootProject.name = 'Aria'
-include ':Queue'
-include ':Schedulers'