Merge pull request #17 from Leifzhang/develop

Leifzhang · web-flow · commit 883e2be9c1c6 · 2022-02-11T11:47:39.000+08:00
[feat] 工程结构优化调整
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,6 +14,7 @@ buildscript {
     }
 }
 
+
 allprojects {
     repositories {
         maven { setUrl("https://maven.aliyun.com/repository/central/") }
@@ -44,8 +45,6 @@ allprojects {
             }
     }
 
-
-
     group = "com.kronos.startup"
 }
 
diff --git a/sample-sdk/network-sdk-demo/build.gradle.kts b/sample-sdk/network-sdk-demo/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
-    id("com.google.devtools.ksp") version "1.5.30-1.0.0"
+    id("com.google.devtools.ksp")
 }
 
 android {
diff --git a/sample-sdk/report-sdk-demo/build.gradle.kts b/sample-sdk/report-sdk-demo/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
     id("kotlin-kapt")
-    id("com.google.devtools.ksp") version "1.5.30-1.0.0"
+    id("com.google.devtools.ksp")
 }
 
 android {
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -1,7 +1,7 @@
 plugins {
-    id 'com.android.application'
-    id 'kotlin-android'
-    id("com.google.devtools.ksp") version "1.5.30-1.0.0"
+    id("com.android.application")
+    id('kotlin-android')
+    id("com.google.devtools.ksp")
 }
 
 android {
@@ -46,7 +46,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.4.0'
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
-    implementation ("io.insert-koin:koin-android:3.1.5")
+    implementation("io.insert-koin:koin-android:3.1.5")
 /*    implementation('com.github.kirich1409:viewbindingpropertydelegate-noreflection:1.5.2') {
         transitive = false
     }*/
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,9 +1,16 @@
 pluginManagement {
+
     repositories {
-        gradlePluginPortal()
         google()
+        maven { setUrl("https://maven.aliyun.com/repository/central/") }
+        gradlePluginPortal()
         maven { setUrl("https://dl.bintray.com/kotlin/kotlin-eap") }
     }
+
+    plugins {
+        id("com.google.devtools.ksp") version ("1.5.30-1.0.0") apply (false)
+
+    }
 }
 
 include(":startup")
diff --git a/startup-annotation/build.gradle b/startup-annotation/build.gradle
@@ -1,4 +1,5 @@
 plugins {
     id 'java-library'
     id 'kotlin'
+    id("maven-publish")
 }
diff --git a/startup-dag-view/build.gradle b/startup-dag-view/build.gradle
@@ -2,6 +2,7 @@ plugins {
     id 'com.android.library'
     id 'kotlin-android'
     id 'kotlin-kapt'
+    id("maven-publish")
 }
 
 android {
diff --git a/startup-ksp-compiler/build.gradle.kts b/startup-ksp-compiler/build.gradle.kts
@@ -2,7 +2,8 @@ import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
 
 plugins {
     kotlin("jvm")
-    id("com.google.devtools.ksp") version "1.5.30-1.0.0"
+    id("maven-publish")
+    id("com.google.devtools.ksp")
 }
 dependencies {
     val kotlinVersion = getKotlinPluginVersion()
diff --git a/startup/build.gradle b/startup/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
+    id("maven-publish")
 }
 apply from: "../gradle/jitpack.gradle"
 

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ buildscript {`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
	`17`	`+`
`17`	`18`	`allprojects {`
`18`	`19`	`repositories {`
`19`	`20`	`maven { setUrl("https://maven.aliyun.com/repository/central/") }`
`@@ -44,8 +45,6 @@ allprojects {`
`44`	`45`	`}`
`45`	`46`	`}`
`46`	`47`
`47`		`-`
`48`		`-`
`49`	`48`	`group = "com.kronos.startup"`
`50`	`49`	`}`
`51`	`50`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id("com.android.library")`
`3`	`3`	`id("org.jetbrains.kotlin.android")`
`4`		`- id("com.google.devtools.ksp") version "1.5.30-1.0.0"`
	`4`	`+ id("com.google.devtools.ksp")`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`android {`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ plugins {`
`2`	`2`	`id("com.android.library")`
`3`	`3`	`id("org.jetbrains.kotlin.android")`
`4`	`4`	`id("kotlin-kapt")`
`5`		`- id("com.google.devtools.ksp") version "1.5.30-1.0.0"`
	`5`	`+ id("com.google.devtools.ksp")`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`android {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id 'java-library'`
`3`	`3`	`id 'kotlin'`
	`4`	`+ id("maven-publish")`
`4`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ plugins {`
`2`	`2`	`id 'com.android.library'`
`3`	`3`	`id 'kotlin-android'`
`4`	`4`	`id 'kotlin-kapt'`
	`5`	`+ id("maven-publish")`
`5`	`6`	`}`
`6`	`7`
`7`	`8`	`android {`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,8 @@ import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion`
`2`	`2`
`3`	`3`	`plugins {`
`4`	`4`	`kotlin("jvm")`
`5`		`- id("com.google.devtools.ksp") version "1.5.30-1.0.0"`
	`5`	`+ id("maven-publish")`
	`6`	`+ id("com.google.devtools.ksp")`
`6`	`7`	`}`
`7`	`8`	`dependencies {`
`8`	`9`	`val kotlinVersion = getKotlinPluginVersion()`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id 'com.android.library'`
`3`	`3`	`id 'kotlin-android'`
	`4`	`+ id("maven-publish")`
`4`	`5`	`}`
`5`	`6`	`apply from: "../gradle/jitpack.gradle"`
`6`	`7`