chore: backward compatibility supports JDK11 (#4)

liu-wanshun · web-flow · commit 69d4efb6a567 · 2025-09-16T02:37:29.000+08:00
diff --git a/README.md b/README.md
@@ -5,6 +5,13 @@
 
       A gradle plugin for generate scaled dimens
 
+## Compatibility
+
+|     | Minimum version | 
+|-----|----------------:|
+| AGP |           7.4.0 |  
+| JDK |              11 |  
+
 ## Add Gradle Plugin
 
 Using the [plugins DSL](https://docs.gradle.org/current/userguide/plugins.html#sec:plugins_block):
@@ -20,7 +27,7 @@ pluginManagement {
 }
 
 plugins {
-    id("io.github.liu-wanshun.scale-dimens") version "1.0.4"
+    id("io.github.liu-wanshun.scale-dimens") version "1.0.5"
 }
 ```
 
@@ -42,7 +49,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("io.github.liu-wanshun.scale-dimens:plugins:1.0.4")
+        classpath("io.github.liu-wanshun.scale-dimens:plugins:1.0.5")
     }
 }
 
diff --git a/app/src/debug/res/values/dimens.xml b/app/src/debug/res/values/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="test1">3dp</dimen>
+    <dimen name="test1">30dp</dimen>
     <dimen name="test2">4dp</dimen>
 </resources>
diff --git a/build-logic/gradle/libs.versions.toml b/build-logic/gradle/libs.versions.toml
@@ -1,9 +1,5 @@
 [versions]
-androidGradlePlugin = "8.1.0"
-kotlin = "1.9.20"
-
-[libraries]
-android-gradlePlugin-api = { group = "com.android.tools.build", name = "gradle-api", version.ref = "androidGradlePlugin" }
+kotlin = "1.9.25"
 
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
diff --git a/build-logic/gradle/wrapper/gradle-wrapper.properties b/build-logic/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.6-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/build-logic/plugins/build.gradle.kts b/build-logic/plugins/build.gradle.kts
@@ -5,17 +5,22 @@ plugins {
 }
 
 java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
+kotlin {
+    compilerOptions {
+        jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)
     }
 }
 
 dependencies {
-    compileOnly(libs.android.gradlePlugin.api)
-    compileOnly("com.android.tools.build:gradle:8.1.0")
+    compileOnly("com.android.tools.build:gradle-api:7.4.0")
+    compileOnly("com.android.tools.build:gradle:7.4.0")
     implementation(gradleKotlinDsl())
 }
 
+version = "1.0.4-SNAPSHOT"
 gradlePlugin {
     plugins {
         create("scaleDimensPlugin") {
diff --git a/build-logic/plugins/src/main/kotlin/app/lws/scaledimens/ScaleDimensPlugin.kt b/build-logic/plugins/src/main/kotlin/app/lws/scaledimens/ScaleDimensPlugin.kt
@@ -23,6 +23,14 @@ class ScaleDimensPlugin : Plugin<Project> {
             val resSourceDirectoriesBySourceSet = mutableMapOf<String, Set<File>>()
 
             androidComponents.apply {
+
+                finalizeDsl { common ->
+                    common.sourceSets
+                        .map { sourceSet -> sourceSet.name to (sourceSet.res as AndroidSourceDirectorySet).srcDirs }
+                        .forEach { resSourceDirectoriesBySourceSet[it.first] = it.second }
+
+                }
+
                 onVariants { variant ->
                     val relevantSourcesSets = setOfNotNull(
                         "main",
@@ -43,24 +51,16 @@ class ScaleDimensPlugin : Plugin<Project> {
                         }
                         .flatten()
 
-                    variant.sources.res?.let {
-                        val addSourceTaskProvider =
-                            project.tasks.register<ScaleDimensTask>("scaleDimens${variant.name}") {
-                                group = "scale-dimens"
-                                this.resourceDirectories.set(resSourceDirectories)
-                                this.extension.set(extension)
-                            }
-                        it.addGeneratedSourceDirectory(
-                            addSourceTaskProvider,
-                            ScaleDimensTask::outputFolder
-                        )
-                    }
-                }
-                finalizeDsl { common ->
-                    common.sourceSets
-                        .map { sourceSet -> sourceSet.name to (sourceSet.res as AndroidSourceDirectorySet).srcDirs }
-                        .forEach { resSourceDirectoriesBySourceSet[it.first] = it.second }
-
+                    val addSourceTaskProvider =
+                        project.tasks.register<ScaleDimensTask>("scaleDimens${variant.name}") {
+                            group = "scale-dimens"
+                            this.resourceDirectories.set(resSourceDirectories)
+                            this.extension.set(extension)
+                        }
+                    variant.sources.res?.addGeneratedSourceDirectory(
+                        addSourceTaskProvider,
+                        ScaleDimensTask::outputFolder
+                    )
                 }
             }
         }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,5 +3,5 @@ plugins {
     alias(libs.plugins.kotlin.android) apply false
     alias(libs.plugins.kotlin.jvm) apply false
     alias(libs.plugins.android.library) apply false
-    id("io.github.liu-wanshun.scale-dimens") version "1.0.2" apply false
+    id("io.github.liu-wanshun.scale-dimens") version "1.0.3" apply false
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,9 +1,6 @@
 [versions]
-androidGradlePlugin = "8.1.0"
-kotlin = "1.9.20"
-
-[libraries]
-android-gradlePlugin-api = { group = "com.android.tools.build", name = "gradle-api", version.ref = "androidGradlePlugin" }
+androidGradlePlugin = "8.13.0"
+kotlin = "1.9.25"
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -20,4 +20,4 @@ dependencyResolutionManagement {
 
 include(":app")
 include(":library")
-include(":build-logic:plugins")
+include(":build-logic:plugins")

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,13 @@`
`5`	`5`
`6`	`6`	`A gradle plugin for generate scaled dimens`
`7`	`7`
	`8`	`+## Compatibility`
	`9`	`+`
	`10`	`+\| \| Minimum version \|`
	`11`	`+\|-----\|----------------:\|`
	`12`	`+\| AGP \| 7.4.0 \|`
	`13`	`+\| JDK \| 11 \|`
	`14`	`+`
`8`	`15`	`## Add Gradle Plugin`
`9`	`16`
`10`	`17`	`Using the [plugins DSL](https://docs.gradle.org/current/userguide/plugins.html#sec:plugins_block):`
`@@ -20,7 +27,7 @@ pluginManagement {`
`20`	`27`	`}`
`21`	`28`
`22`	`29`	`plugins {`
`23`		`- id("io.github.liu-wanshun.scale-dimens") version "1.0.4"`
	`30`	`+ id("io.github.liu-wanshun.scale-dimens") version "1.0.5"`
`24`	`31`	`}`
`25`	`32`	```
`26`	`33`
`@@ -42,7 +49,7 @@ buildscript {`
`42`	`49`	`}`
`43`	`50`	`}`
`44`	`51`	`dependencies {`
`45`		`- classpath("io.github.liu-wanshun.scale-dimens:plugins:1.0.4")`
	`52`	`+ classpath("io.github.liu-wanshun.scale-dimens:plugins:1.0.5")`
`46`	`53`	`}`
`47`	`54`	`}`
`48`	`55`
Original file line number	Diff line number	Diff line change
`@@ -5,17 +5,22 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`java {`
`8`		`- toolchain {`
`9`		`- languageVersion.set(JavaLanguageVersion.of(17))`
	`8`	`+ sourceCompatibility = JavaVersion.VERSION_11`
	`9`	`+ targetCompatibility = JavaVersion.VERSION_11`
	`10`	`+}`
	`11`	`+kotlin {`
	`12`	`+ compilerOptions {`
	`13`	`+ jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11)`
`10`	`14`	`}`
`11`	`15`	`}`
`12`	`16`
`13`	`17`	`dependencies {`
`14`		`- compileOnly(libs.android.gradlePlugin.api)`
`15`		`- compileOnly("com.android.tools.build:gradle:8.1.0")`
	`18`	`+ compileOnly("com.android.tools.build:gradle-api:7.4.0")`
	`19`	`+ compileOnly("com.android.tools.build:gradle:7.4.0")`
`16`	`20`	`implementation(gradleKotlinDsl())`
`17`	`21`	`}`
`18`	`22`
	`23`	`+version = "1.0.4-SNAPSHOT"`
`19`	`24`	`gradlePlugin {`
`20`	`25`	`plugins {`
`21`	`26`	`create("scaleDimensPlugin") {`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@ plugins {`
`3`	`3`	`alias(libs.plugins.kotlin.android) apply false`
`4`	`4`	`alias(libs.plugins.kotlin.jvm) apply false`
`5`	`5`	`alias(libs.plugins.android.library) apply false`
`6`		`- id("io.github.liu-wanshun.scale-dimens") version "1.0.2" apply false`
	`6`	`+ id("io.github.liu-wanshun.scale-dimens") version "1.0.3" apply false`
`7`	`7`	`}`