Merge pull request #1036 from mikepenz/feature/update_dependencies_20…

…241116 Refactor gradle property retrieval with lazy APIs | Upgrade Gradle to 8.11 | Increase gradle min requirement to 7.x
mikepenz · Nov 16, 2024 · 918c624 · 918c624
2 parents 7e2b97b + 6359dce
commit 918c624
Show file tree

Hide file tree

Showing 21 changed files with 338 additions and 85 deletions.
diff --git a/app-desktop/README.md b/app-desktop/README.md
@@ -8,6 +8,6 @@
 
 ### Run Desktop app
 
-```
+```bash
 ./gradlew :app-desktop:run
 ```
diff --git a/app-desktop/src/main/resources/aboutlibraries.json b/app-desktop/src/main/resources/aboutlibraries.json
@@ -1,6 +1,6 @@
 {
     "metadata": {
-        "generated": "2024-11-01T18:58:28.538Z"
+        "generated": "2024-11-16T14:12:37.75Z"
     },
     "libraries": [
         {
@@ -160,7 +160,7 @@
                     "name": "Mike Penz"
                 }
             ],
-            "artifactVersion": "11.2.3",
+            "artifactVersion": "11.3.0-b01",
             "description": "AboutLibraries automatically detects all dependencies of a project and collects their information including the license. Optionally visualising it via the provided ui components.",
             "scm": {
                 "connection": "scm:[email protected]:mikepenz/AboutLibraries.git",
@@ -183,7 +183,7 @@
                     "name": "Mike Penz"
                 }
             ],
-            "artifactVersion": "11.2.3",
+            "artifactVersion": "11.3.0-b01",
             "description": "AboutLibraries automatically detects all dependencies of a project and collects their information including the license. Optionally visualising it via the provided ui components.",
             "scm": {
                 "connection": "scm:[email protected]:mikepenz/AboutLibraries.git",
@@ -207,7 +207,7 @@
                     "name": "Compose Multiplatform Team"
                 }
             ],
-            "artifactVersion": "2.8.3",
+            "artifactVersion": "2.8.4",
             "description": "Compose integration with Lifecycle",
             "scm": {
                 "connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -231,7 +231,7 @@
                     "name": "Compose Multiplatform Team"
                 }
             ],
-            "artifactVersion": "1.7.0",
+            "artifactVersion": "1.7.1",
             "description": "Animation engine and animation primitives that are the building blocks of the Compose animation library",
             "scm": {
                 "connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -255,7 +255,7 @@
                     "name": "Compose Multiplatform Team"
                 }
             ],
-            "artifactVersion": "1.7.0",
+            "artifactVersion": "1.7.1",
             "description": "Compose animation library",
             "scm": {
                 "connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -279,7 +279,7 @@
                     "name": "Compose Multiplatform Team"
                 }
             ],
-            "artifactVersion": "1.7.0",
+            "artifactVersion": "1.7.1",
             "description": "Compose Desktop",
             "scm": {
                 "connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -303,7 +303,7 @@
                     "name": "Compose Multiplatform Team"
                 }
             ],
-            "artifactVersion": "1.7.0",
+            "artifactVersion": "1.7.1",
             "description": "Higher level abstractions of the Compose UI primitives. This library is design system agnostic, providing the high-level building blocks for both application and design-system developers",
             "scm": {
                 "connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -327,7 +327,7 @@
                     "name": "Compose Multiplatform Team"
                 }
             ],
-            "artifactVersion": "1.7.0",
+            "artifactVersion": "1.7.1",
             "description": "Compose layout implementations",
             "scm": {
                 "connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -351,7 +351,7 @@
                     "name": "Compose Multiplatform Team"
                 }
             ],
-            "artifactVersion": "1.7.0",
+            "artifactVersion": "1.7.1",
             "description": "Compose Material You Design Components library",
             "scm": {
                 "connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -375,7 +375,7 @@
                     "name": "Compose Multiplatform Team"
                 }
             ],
-            "artifactVersion": "1.7.0",
+            "artifactVersion": "1.7.1",
             "description": "Compose Material Design Components library",
             "scm": {
                 "connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -399,7 +399,7 @@
                     "name": "Compose Multiplatform Team"
                 }
             ],
-            "artifactVersion": "1.7.0",
+            "artifactVersion": "1.7.1",
             "description": "Compose Material Design core icons. This module contains the most commonly used set of Material icons.",
             "scm": {
                 "connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -423,7 +423,7 @@
                     "name": "Compose Multiplatform Team"
                 }
             ],
-            "artifactVersion": "1.7.0",
+            "artifactVersion": "1.7.1",
             "description": "Material ripple used to build interactive components",
             "scm": {
                 "connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -447,7 +447,7 @@
                     "name": "Compose Multiplatform Team"
                 }
             ],
-            "artifactVersion": "1.7.0",
+            "artifactVersion": "1.7.1",
             "description": "Tree composition support for code generated by the Compose compiler plugin and corresponding public API",
             "scm": {
                 "connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -471,7 +471,7 @@
                     "name": "Compose Multiplatform Team"
                 }
             ],
-            "artifactVersion": "1.7.0",
+            "artifactVersion": "1.7.1",
             "description": "Compose components that allow saving and restoring the local ui state",
             "scm": {
                 "connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -495,7 +495,7 @@
                     "name": "Compose Multiplatform Team"
                 }
             ],
-            "artifactVersion": "1.7.0",
+            "artifactVersion": "1.7.1",
             "description": "Compose UI primitives. This library contains the primitives that form the Compose UI Toolkit, such as drawing, measurement and layout.",
             "scm": {
                 "connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -519,7 +519,7 @@
                     "name": "Compose Multiplatform Team"
                 }
             ],
-            "artifactVersion": "1.7.0",
+            "artifactVersion": "1.7.1",
             "description": "Compose classes related to dimensions without units",
             "scm": {
                 "connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -543,7 +543,7 @@
                     "name": "Compose Multiplatform Team"
                 }
             ],
-            "artifactVersion": "1.7.0",
+            "artifactVersion": "1.7.1",
             "description": "Compose graphics",
             "scm": {
                 "connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -567,7 +567,7 @@
                     "name": "Compose Multiplatform Team"
                 }
             ],
-            "artifactVersion": "1.7.0",
+            "artifactVersion": "1.7.1",
             "description": "Compose Text primitives and utilities",
             "scm": {
                 "connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -591,7 +591,7 @@
                     "name": "Compose Multiplatform Team"
                 }
             ],
-            "artifactVersion": "1.7.0",
+            "artifactVersion": "1.7.1",
             "description": "Compose tooling library API. This library provides the API required to declare @Preview composables in user apps.",
             "scm": {
                 "connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -615,7 +615,7 @@
                     "name": "Compose Multiplatform Team"
                 }
             ],
-            "artifactVersion": "1.7.0",
+            "artifactVersion": "1.7.1",
             "description": "Compose classes for simple units",
             "scm": {
                 "connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -639,7 +639,7 @@
                     "name": "Compose Multiplatform Team"
                 }
             ],
-            "artifactVersion": "1.7.0",
+            "artifactVersion": "1.7.1",
             "description": "Internal Compose utilities used by other modules",
             "scm": {
                 "connection": "scm:git:https://github.com/JetBrains/compose-jb.git",
@@ -845,7 +845,7 @@
                     "name": "JetBrains Team"
                 }
             ],
-            "artifactVersion": "1.7.1",
+            "artifactVersion": "1.7.3",
             "description": "Kotlin multiplatform serialization runtime library",
             "scm": {
                 "url": "https://github.com/Kotlin/kotlinx.serialization"
@@ -867,7 +867,7 @@
                     "name": "JetBrains Team"
                 }
             ],
-            "artifactVersion": "1.7.1",
+            "artifactVersion": "1.7.3",
             "description": "Kotlin multiplatform serialization runtime library",
             "scm": {
                 "url": "https://github.com/Kotlin/kotlinx.serialization"
@@ -889,7 +889,7 @@
                     "name": "JetBrains Team"
                 }
             ],
-            "artifactVersion": "1.7.1",
+            "artifactVersion": "1.7.3",
             "description": "Kotlin multiplatform serialization runtime library",
             "scm": {
                 "url": "https://github.com/Kotlin/kotlinx.serialization"
@@ -911,7 +911,7 @@
                     "name": "Compose Multiplatform Team"
                 }
             ],
-            "artifactVersion": "0.8.15",
+            "artifactVersion": "0.8.18",
             "description": "Kotlin Skia bindings",
             "scm": {
                 "connection": "scm:git:https://www.github.com/JetBrains/skiko.git",
@@ -935,7 +935,7 @@
                     "name": "Compose Multiplatform Team"
                 }
             ],
-            "artifactVersion": "0.8.15",
+            "artifactVersion": "0.8.18",
             "description": "Kotlin Skia bindings",
             "scm": {
                 "connection": "scm:git:https://www.github.com/JetBrains/skiko.git",

diff --git a/app-test/files/aboutlibraries.json b/app-test/files/aboutlibraries.json
diff --git a/app-wasm/README.md b/app-wasm/README.md
@@ -8,6 +8,6 @@
 
 ### Run Wasm app
 
-```
-./gradlew :app-wasm:wasmJsRun   
+```bash
+./gradlew :app-wasm:wasmJsRun
 ```
diff --git a/app-wasm/build.gradle.kts b/app-wasm/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")

diff --git a/app-wasm/src/commonMain/composeResources/files/aboutlibraries.json b/app-wasm/src/commonMain/composeResources/files/aboutlibraries.json
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ dokka = "1.9.20"
 kotlinCore = { require = "2.0.21" }
 kotlinCoroutines = { require = "1.9.0" }
 kotlinxSerialization = "1.7.3"
-kotlinxCollections = "0.3.7"
+kotlinxCollections = "0.3.8"
 # compose
 compose = "1.7.5"
 compose-plugin = "1.7.1"
@@ -48,7 +48,9 @@ mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "gradleMvnPu
 [libraries]
 # build
 gradle-build = { module = "com.android.tools.build:gradle", version.ref = "gradleBuild" }
+android-lint-gradle = { module = "androidx.lint:lint-gradle", version = "1.0.0-alpha02" }
 # kotlin
+android-lint-plug = { module = "com.android.lint:com.android.lint.gradle.plugin", version.ref = "gradleBuild" }
 dokka-plug = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlinCore" }
 kotlin-plug = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinCore" }

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.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/plugin-build/build.gradle b/plugin-build/build.gradle
@@ -9,6 +9,7 @@ buildscript {
     }
 
     dependencies {
+        classpath(libs.android.lint.plug.get())
         classpath(libs.kotlin.plug.get())
         classpath(libs.dokka.plug)
     }

diff --git a/plugin-build/plugin/build.gradle b/plugin-build/plugin/build.gradle
@@ -1,11 +1,13 @@
 plugins {
+    id "com.android.lint"
     id "org.jetbrains.kotlin.jvm"
     id "com.gradle.plugin-publish" version "0.20.0"
     id "java-gradle-plugin"
     id "maven-publish"
     id "org.jetbrains.dokka"
 }
 
+
 group = "com.mikepenz.aboutlibraries.plugin"
 version = rootProject.properties["version"]
 
@@ -60,6 +62,9 @@ dependencies {
 
     // add better android support
     compileOnly(libs.gradle.build)
+
+    // lint rules
+    lintChecks(libs.android.lint.gradle)
 }
 
 // generate zip file for android maven release tool
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,6 @@ @@
     ### Run Desktop app
-    ```
+    ```bash
     ./gradlew :app-desktop:run
     ```