Merge pull request #1050 from mikepenz/develop

dev -> main

Author: mikepenz

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/ci.yml

@@ -112,7 +112,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
 
       - name: Validate gradle wrapper
-        uses: gradle/actions/wrapper-validation@v3
+        uses: gradle/actions/wrapper-validation@v4
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
@@ -137,7 +137,7 @@ jobs:
         if: github.event_name  == 'pull_request'
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.0'
+          ruby-version: '3.3'
           bundler-cache: true
 
       - name: Run Danger

Dangerfile

@@ -14,10 +14,10 @@ fail("PR specifies label DO NOT MERGE") if github.pr_labels.any? { |label| label
 # Warn when there is a big PR
 warn("Big PR") if git.lines_of_code > 5000
 
-File.open("settings.gradle", "r") do |file_handle|
+File.open("settings.gradle.kts", "r") do |file_handle|
   file_handle.each_line do |setting|
     if setting.include? "include"
-        gradleModule = setting[10, setting.length-12]
+        gradleModule = setting[10, setting.length-13]
 
         # AndroidLint
         androidLintFile = String.new(gradleModule + "/build/reports/lint-results.xml")

Gemfile.lock

@@ -1,10 +1,11 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ansi (1.5.0)
     ast (2.4.2)
+    base64 (0.2.0)
     claide (1.1.0)
     claide-plugins (0.9.2)
       cork
@@ -13,81 +14,68 @@ GEM
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (9.0.0)
+    danger (9.5.1)
+      base64 (~> 0.2)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
       cork (~> 0.1)
-      faraday (>= 0.9.0, < 2.0)
+      faraday (>= 0.9.0, < 3.0)
       faraday-http-cache (~> 2.0)
-      git (~> 1.7)
+      git (~> 1.13)
       kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
-      no_proxy_fix
-      octokit (~> 5.0)
+      octokit (>= 4.0)
+      pstore (~> 0.1)
       terminal-table (>= 1, < 4)
-    danger-android_lint (0.0.11)
+    danger-android_lint (0.0.12)
       danger-plugin-api (~> 1.0)
       oga
     danger-kotlin_detekt (0.0.3)
       danger-plugin-api (~> 1.0)
     danger-plugin-api (1.0.0)
       danger (> 2.0)
-    faraday (1.10.2)
-      faraday-em_http (~> 1.0)
-      faraday-em_synchrony (~> 1.0)
-      faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0)
-      faraday-multipart (~> 1.0)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.0)
-      faraday-patron (~> 1.0)
-      faraday-rack (~> 1.0)
-      faraday-retry (~> 1.0)
-      ruby2_keywords (>= 0.0.4)
-    faraday-em_http (1.0.0)
-    faraday-em_synchrony (1.0.0)
-    faraday-excon (1.1.0)
-    faraday-http-cache (2.4.1)
+    faraday (2.12.2)
+      faraday-net_http (>= 2.0, < 3.5)
+      json
+      logger
+    faraday-http-cache (2.5.1)
       faraday (>= 0.8)
-    faraday-httpclient (1.0.1)
-    faraday-multipart (1.0.4)
-      multipart-post (~> 2)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.2.0)
-    faraday-patron (1.0.0)
-    faraday-rack (1.0.0)
-    faraday-retry (1.0.3)
-    git (1.13.0)
+    faraday-net_http (3.4.0)
+      net-http (>= 0.5.0)
+    git (1.19.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    kramdown (2.4.0)
-      rexml
+    json (2.9.1)
+    kramdown (2.5.1)
+      rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    multipart-post (2.2.3)
+    logger (1.6.4)
     nap (1.1.0)
-    no_proxy_fix (0.1.2)
-    octokit (5.6.1)
+    net-http (0.6.0)
+      uri
+    octokit (9.2.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     oga (3.4)
       ast
       ruby-ll (~> 2.1)
     open4 (1.3.4)
-    public_suffix (5.0.1)
+    pstore (0.1.4)
+    public_suffix (6.0.1)
     rchardet (1.8.0)
-    rexml (3.3.9)
-    ruby-ll (2.1.2)
+    rexml (3.4.0)
+    ruby-ll (2.1.3)
       ansi
       ast
-    ruby2_keywords (0.0.5)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.6.0)
+    uri (1.0.2)
 
 PLATFORMS
   ruby
@@ -98,4 +86,4 @@ DEPENDENCIES
   danger-kotlin_detekt
 
 BUNDLED WITH
-   2.3.11
+   2.6.2

README.md

@@ -37,8 +37,8 @@
 
 ## Latest releases 🛠
 
-- [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
+- Java 17 | [v11.4.0](https://github.com/mikepenz/AboutLibraries/tree/11.4.0
 
 ## Gradle Plugin
 
@@ -49,7 +49,6 @@ AboutLibraries v10 includes a completely redone plugin, with build cache support
 <details open><summary><b>Using the plugins DSL (for single modules)</b></summary>
 <p>
 
-
 ```gradle
 // Root build.gradle
 id 'com.mikepenz.aboutlibraries.plugin' version "${latestAboutLibsRelease}" apply false
@@ -113,7 +112,7 @@ aboutLibraries {
     // See https://github.com/mikepenz/AboutLibraries#special-repository-support
     fetchRemoteFunding = true
     // (Optional) GitHub token to raise API request limit to allow fetching more licenses
-    gitHubApiToken = getLocalOrGlobalProperty("github.pat")
+    gitHubApiToken = property("github.pat")
     // Full license text for license IDs mentioned here will be included, even if no detected dependency uses them.
     additionalLicenses = ["mit", "mpl_2_0"]
     // Allows to exclude some fields from the generated meta data field.

aboutlibraries-compose-m2/build.gradle.kts

@@ -1,95 +1,22 @@
-@file:OptIn(ExperimentalWasmDsl::class)
-
-import com.vanniktech.maven.publish.SonatypeHost
-import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
-
 plugins {
-    kotlin("multiplatform")
-    alias(libs.plugins.androidLibrary)
-    alias(libs.plugins.jetbrainsCompose)
-    alias(libs.plugins.composeCompiler)
-    alias(libs.plugins.dokka)
-    alias(libs.plugins.mavenPublish)
+    id("com.mikepenz.convention.android-library")
+    id("com.mikepenz.convention.kotlin-multiplatform")
+    id("com.mikepenz.convention.compose")
+    id("com.mikepenz.convention.publishing")
 }
 
 android {
-    compileSdk = libs.versions.compileSdk.get().toInt()
     namespace = "com.mikepenz.aboutlibraries.ui.compose"
 
-    defaultConfig {
-        minSdk = libs.versions.minSdk.get().toInt()
-    }
-
-    buildTypes {
-        named("release") {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
-            )
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-
     tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
-        kotlinOptions {
-            jvmTarget = "11"
-
-            if (project.findProperty("composeCompilerReports") == "true") {
-                freeCompilerArgs += listOf(
-                    "-P",
-                    "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=${project.layout.buildDirectory.asFile.get().absolutePath}/compose_compiler"
-                )
-            }
-            if (project.findProperty("composeCompilerMetrics") == "true") {
-                freeCompilerArgs += listOf(
-                    "-P",
-                    "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=${project.layout.buildDirectory.asFile.get().absolutePath}/compose_compiler"
-                )
-            }
-
+        compilerOptions {
             val outputDir = rootDir.resolve("aboutlibraries-core/compose_compiler_config.conf").path
-            compilerOptions.freeCompilerArgs.addAll(
-                "-P",
-                "plugin:androidx.compose.compiler.plugins.kotlin:stabilityConfigurationPath=${outputDir}"
-            )
+            freeCompilerArgs.addAll("-P", "plugin:androidx.compose.compiler.plugins.kotlin:stabilityConfigurationPath=${outputDir}")
         }
     }
-
-    buildFeatures {
-        compose = true
-    }
-
-    lint {
-        abortOnError = false
-    }
 }
 
 kotlin {
-    applyDefaultHierarchyTemplate()
-
-    jvm()
-
-    androidTarget {
-        publishLibraryVariants("release")
-    }
-
-    js(IR) {
-        browser()
-    }
-
-    iosX64()
-    iosArm64()
-    iosSimulatorArm64()
-    macosX64()
-    macosArm64()
-    wasmJs {
-        nodejs()
-    }
-
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -108,7 +35,6 @@ dependencies {
 
     debugImplementation(compose.uiTooling)
     "androidMainImplementation"(compose.preview)
-
     "androidMainImplementation"(libs.androidx.core.ktx)
 }
 
@@ -117,23 +43,4 @@ configurations.configureEach {
     // https://github.com/chrisbanes/tivi/blob/5e7586465337d326a1f1e40e0b412ecd2779bb5c/build.gradle#L72
     exclude(group = "androidx.appcompat")
     exclude(group = "com.google.android.material", module = "material")
-
-
-}
-
-tasks.dokkaHtml.configure {
-    dokkaSourceSets {
-        configureEach {
-            noAndroidSdkLink.set(false)
-        }
-    }
-}
-
-
-
-if (project.hasProperty("pushall") || project.hasProperty("library_compose_only")) {
-    mavenPublishing {
-        publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, true)
-        signAllPublications()
-    }
 }