Merge pull request #1043 from mikepenz/develop

dev -> main

.github/workflows/ci.yml

@@ -34,7 +34,7 @@ jobs:
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Cache konan
         uses: actions/cache@v4
@@ -108,20 +108,24 @@ jobs:
             15
             17
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
       - name: Validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v2
+        uses: gradle/actions/wrapper-validation@v3
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-
       - name: Publish plugin locally
         run: |
           cd plugin-build
           ./gradlew publishToMavenLocal
 
+      - name: Run Lint on Gradle Plugin
+        run: |
+          ./gradlew plugin-build:plugin:lint
+
       - name: Build Debug
         run: ./gradlew app:assembleDebug
 
@@ -173,7 +177,7 @@ jobs:
 
       - name: Build Changelog
         id: github_release
-        uses: mikepenz/release-changelog-builder-action@v4
+        uses: mikepenz/release-changelog-builder-action@v5
         if: startsWith(github.ref, 'refs/tags/')
         with:
           configuration: ".github/config/configuration.json"

.github/workflows/gradle-dependency-submission.yml

@@ -25,6 +25,6 @@ jobs:
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Setup Gradle & Submit dependency graphs
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
         with:
           dependency-graph: generate-and-submit

.github/workflows/static.yml

@@ -31,16 +31,18 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+
       - name: Setup Pages
-        uses: actions/configure-pages@v4
+        uses: actions/configure-pages@v5
+
       - uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: |
             11
             17
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
+        uses: gradle/actions/setup-gradle@v4
       - name: Build Page
         run: |
           ./gradlew :app-wasm:exportLibraryDefinitions -PaboutLibraries.exportPath=src/commonMain/composeResources/files/

Gemfile.lock

@@ -77,7 +77,7 @@ GEM
     open4 (1.3.4)
     public_suffix (5.0.1)
     rchardet (1.8.0)
-    rexml (3.2.5)
+    rexml (3.3.9)
     ruby-ll (2.1.2)
       ansi
       ast

README.md

@@ -9,8 +9,6 @@
     <a href="#whats-included-">What's included 🚀</a> &bull;
     <a href="#setup">Setup 🛠️</a> &bull;
     <a href="#gradle-api">Gradle API️</a> &bull;
-    <a href="https://mikepenz.github.io/AboutLibraries/index.html">SDK Docs 📖 </a> &bull;
-    <a href="https://mikepenz.github.io/AboutLibraries/plugin/index.html">Plugin Docs 📖</a> &bull;
     <a href="MIGRATION.md">Migration Guide 🧬</a> &bull;
     <a href="https://play.google.com/store/apps/details?id=com.mikepenz.aboutlibraries.sample">Sample App</a>
 </p>
@@ -39,7 +37,8 @@
 
 ## Latest releases 🛠
 
-- Kotlin 2.x && Multiplatform && Compose && Plugin | [v11.2.3](https://github.com/mikepenz/AboutLibraries/tree/v11.2.3)
+- [v11.2.3](https://github.com/mikepenz/AboutLibraries/tree/v11.2.3)
+- Compile 35 | Gradle 7.0+ | [v11.3.0](https://github.com/mikepenz/AboutLibraries/tree/v11.3.0
 
 ## Gradle Plugin
 

aboutlibraries-compose-m2/build.gradle.kts

@@ -21,7 +21,7 @@ android {
     }
 
     buildTypes {
-        getByName("release") {
+        named("release") {
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
@@ -34,7 +34,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
         kotlinOptions {
             jvmTarget = "11"
 
@@ -133,7 +133,7 @@ tasks.dokkaHtml.configure {
 
 if (project.hasProperty("pushall") || project.hasProperty("library_compose_only")) {
     mavenPublishing {
-        publishToMavenCentral(SonatypeHost.S01)
+        publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, true)
         signAllPublications()
     }
 }

aboutlibraries-compose-m3/build.gradle.kts

@@ -21,7 +21,7 @@ android {
     }
 
     buildTypes {
-        getByName("release") {
+        named("release") {
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
@@ -34,7 +34,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
-    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
         kotlinOptions {
             jvmTarget = "11"
             if (project.findProperty("composeCompilerReports") == "true") {
@@ -131,7 +131,7 @@ tasks.dokkaHtml.configure {
 
 if (project.hasProperty("pushall") || project.hasProperty("library_compose_m3_only")) {
     mavenPublishing {
-        publishToMavenCentral(SonatypeHost.S01)
+        publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, true)
         signAllPublications()
     }
 }

aboutlibraries-core/build.gradle.kts

@@ -19,7 +19,7 @@ android {
     }
 
     buildTypes {
-        getByName("release") {
+        named("release") {
             isMinifyEnabled = false
         }
     }
@@ -29,7 +29,7 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
-    tasks.withType<KotlinCompile> {
+    tasks.withType<KotlinCompile>().configureEach {
         kotlinOptions {
             jvmTarget = "11"
             freeCompilerArgs += listOf(
@@ -52,7 +52,7 @@ kotlin {
     js(IR) {
         nodejs {}
         browser {}
-        compilations.all {
+        compilations.configureEach {
             kotlinOptions {
                 moduleKind = "umd"
                 sourceMap = true
@@ -94,9 +94,15 @@ kotlin {
     watchosDeviceArm64()
 
     // common sets
-    ios()
-    tvos()
-    watchos()
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+    tvosX64()
+    tvosArm64()
+    tvosSimulatorArm64()
+    watchosX64()
+    watchosArm64()
+    watchosSimulatorArm64()
 
     /*
     cocoapods {
@@ -154,7 +160,7 @@ tasks.dokkaHtml.configure {
 
 if (project.hasProperty("pushall") || project.hasProperty("library_core_only")) {
     mavenPublishing {
-        publishToMavenCentral(SonatypeHost.S01)
+        publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, true)
         signAllPublications()
     }
 }

aboutlibraries/build.gradle

@@ -75,7 +75,7 @@ dependencies {
 import com.vanniktech.maven.publish.SonatypeHost
 if (project.hasProperty('pushall') || project.hasProperty('library_only')) {
     mavenPublishing {
-        publishToMavenCentral(SonatypeHost.S01)
+        publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, true)
         signAllPublications()
     }
 }

app-desktop/README.md

@@ -8,6 +8,6 @@
 
 ### Run Desktop app
 
-```
+```bash
 ./gradlew :app-desktop:run
 ```

app-desktop/build.gradle.kts

@@ -29,12 +29,12 @@ dependencies {
     // implementation("org.apache.commons:commons-csv:1.9.0")
 }
 
-tasks.withType<JavaCompile> {
+tasks.withType<JavaCompile>().configureEach {
     sourceCompatibility = "11"
     targetCompatibility = "11"
 }
 
-tasks.withType<KotlinCompile> {
+tasks.withType<KotlinCompile>().configureEach {
     kotlinOptions.jvmTarget = "11"
 }