build:调整逻辑

Author: Petterpx

floatingx/build.gradle

@@ -6,7 +6,7 @@ plugins {
 }
 
 mavenPublishing {
-    coordinates("io.github.petterpx", "floatingx", versionName)
+    coordinates("io.github.petterpx", "floatingx", version_name)
 }
 
 android {
@@ -18,8 +18,8 @@ android {
     defaultConfig {
         minSdk minsdk_version
         targetSdk targetsdk_version
-        versionCode android.versionCode
-        versionName android.versionName
+        versionCode version_code
+        versionName version_name
         consumerProguardFiles "proguard-floatingx.pro"
     }
 

floatingx_compose/build.gradle

@@ -6,19 +6,18 @@ plugins {
 }
 
 mavenPublishing {
-    coordinates("io.github.petterpx", "floatingx-compose", versionName)
+    coordinates("io.github.petterpx", "floatingx-compose", version_name)
 }
 
 android {
     namespace 'com.petterp.floatingx.compose'
 
     compileSdk compilesdk_version
-    def android = rootProject.ext
     defaultConfig {
         minSdk minsdk_version
         targetSdk targetsdk_version
-        versionCode android.versionCode
-        versionName android.versionName
+        versionCode version_code
+        versionName version_name
         consumerProguardFiles "proguard-floatingx-compose.pro"
     }
 

gradle/config.gradle

@@ -3,4 +3,26 @@ ext {
     minsdk_version = 21
     targetsdk_version = 31
     compilesdk_version = 31
+    version_code = gitVersionCode()
+    version_name = gitVersionTag()
 }
+
+static def gitVersionTag() {
+    def commit = 'git rev-list --tags --max-count=1'
+    def cmd = "git describe --tags ${commit.execute().text}"
+    def version = cmd.execute().text.trim()
+    return version
+}
+
+static def gitVersionCode() {
+    def cmd = 'git rev-list HEAD --count'
+    return cmd.execute().text.trim().toInteger()
+}
+
+
+println '------Fx---->'
+println("isDev-> $ext.isDev")
+println("isPublish-> $ext.isPublish")
+println("versionCode-> $ext.version_code")
+println("versionName-> $ext.version_name")
+println "------Fx-end----->"

settings.gradle

@@ -36,26 +36,4 @@ gradle.projectsLoaded { project ->
 
     rootProjectExt.isDev = localProperties.getProperty("isDev", "true").toBoolean()
     rootProjectExt.isPublish = rootProject.findProperty("isPublish") ?: false
-    rootProjectExt.versionCode = gitVersionCode()
-    rootProjectExt.versionName = gitVersionTag()
-
-    println '------Fx---->'
-    println("isDev-> $rootProjectExt.isDev")
-    println("isPublish-> $rootProjectExt.isPublish")
-    println("versionCode-> $rootProjectExt.versionCode")
-    println("versionName-> $rootProjectExt.versionName")
-    println "------Fx-end----->"
-}
-
-
-static def gitVersionTag() {
-    def commit = 'git rev-list --tags --max-count=1'
-    def cmd = "git describe --tags ${commit.execute().text}"
-    def version = cmd.execute().text.trim()
-    return version
-}
-
-static def gitVersionCode() {
-    def cmd = 'git rev-list HEAD --count'
-    return cmd.execute().text.trim().toInteger()
 }