Merge pull request #6 from makeevrserg/dependabot/gradle/versions-315…

…c016054 build(deps): bump the versions group with 6 updates
makeevrserg · May 29, 2024 · 22ace3a · 22ace3a
2 parents 9bfaa06 + d02d615
commit 22ace3a
Show file tree

Hide file tree

Showing 16 changed files with 107 additions and 32 deletions.
diff --git a/.github/workflows/detekt-validation.yml → .github/workflows/call-detekt-validation.yml b/.github/workflows/detekt-validation.yml → .github/workflows/call-detekt-validation.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 1.17
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'

diff --git a/...b/workflows/gradle-wrapper-validation.yml → ...kflows/call-gradle-wrapper-validation.yml b/...b/workflows/gradle-wrapper-validation.yml → ...kflows/call-gradle-wrapper-validation.yml
diff --git a/.github/workflows/call-publish-validation.yml b/.github/workflows/call-publish-validation.yml
@@ -0,0 +1,38 @@
+name: "tests"
+on:
+  workflow_call:
+    secrets:
+      SIGNING_KEY_ID:
+        required: true
+      SIGNING_PASSWORD:
+        required: true
+      OSSRH_USERNAME:
+        required: true
+      OSSRH_PASSWORD:
+        required: true
+      SIGNING_KEY:
+        required: true
+
+jobs:
+  tests:
+    name: "Run tests"
+    runs-on: ubuntu-latest
+    env:
+      SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
+      SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+      OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+      OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+      SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 1.17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - name: Give gradle permission
+        run: chmod +x gradlew
+      - name: Run publish
+        uses: gradle/gradle-build-action@v3
+        with:
+          arguments: publishToMavenLocal
diff --git a/.github/workflows/tests-validation.yml → .github/workflows/call-tests-validation.yml b/.github/workflows/tests-validation.yml → .github/workflows/call-tests-validation.yml
@@ -18,4 +18,4 @@ jobs:
       - name: Run tests
         uses: gradle/gradle-build-action@v3
         with:
-          arguments: test
+          arguments: allTests
diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml
@@ -21,10 +21,19 @@ concurrency:
 
 jobs:
   gradle_validation:
-    uses: ./.github/workflows/gradle-wrapper-validation.yml
+    uses: ./.github/workflows/call-gradle-wrapper-validation.yml
   detekt_validation:
     needs: gradle_validation
-    uses: ./.github/workflows/detekt-validation.yml
+    uses: ./.github/workflows/call-detekt-validation.yml
   tests_validation:
     needs: gradle_validation
-    uses: ./.github/workflows/tests-validation.yml
+    uses: ./.github/workflows/call-tests-validation.yml
+  publsih_validation:
+    needs: gradle_validation
+    uses: ./.github/workflows/call-publish-validation.yml
+    secrets:
+      SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
+      SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+      OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+      OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+      SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -7,13 +7,13 @@ on:
 
 jobs:
   gradle_validation:
-    uses: ./.github/workflows/gradle-wrapper-validation.yml
+    uses: ./.github/workflows/call-gradle-wrapper-validation.yml
   detekt_validation:
     needs: gradle_validation
-    uses: ./.github/workflows/detekt-validation.yml
+    uses: ./.github/workflows/call-detekt-validation.yml
   tests_validation:
     needs: gradle_validation
-    uses: ./.github/workflows/tests-validation.yml
+    uses: ./.github/workflows/call-tests-validation.yml
   publish:
     name: Publish library at mavenCentral
     runs-on: macOS-latest

diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,9 @@
 .gradle
 .idea
+.kotlin
 build
 mikro-core/build
 mikro-platform/build
 mikro-locale/build
-local.properties
+local.properties
+kotlin-js-store/*
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,12 +1,21 @@
-buildscript {
-    dependencies {
-        classpath(libs.makeevrserg.gradleplugin.convention)
-        classpath(libs.makeevrserg.gradleplugin.android)
-    }
-}
 plugins {
     alias(libs.plugins.kotlin.multiplatform) apply false
     alias(libs.plugins.gradle.android) apply false
+    // klibs - core
+    alias(libs.plugins.klibs.gradle.detekt) apply false
+    alias(libs.plugins.klibs.gradle.detekt.compose) apply false
+    alias(libs.plugins.klibs.gradle.dokka.root) apply false
+    alias(libs.plugins.klibs.gradle.dokka.module) apply false
+    alias(libs.plugins.klibs.gradle.java.core) apply false
+    alias(libs.plugins.klibs.gradle.stub.javadoc) apply false
+    alias(libs.plugins.klibs.gradle.publication) apply false
+    alias(libs.plugins.klibs.gradle.rootinfo) apply false
+    // klibs - android
+    alias(libs.plugins.klibs.gradle.android.core) apply false
+    alias(libs.plugins.klibs.gradle.android.compose) apply false
+    alias(libs.plugins.klibs.gradle.android.apk.sign) apply false
+    alias(libs.plugins.klibs.gradle.android.apk.name) apply false
+    alias(libs.plugins.klibs.gradle.android.publication) apply false
 }
 
 apply(plugin = "ru.astrainteractive.gradleplugin.dokka.root")

diff --git a/gradle.properties b/gradle.properties
@@ -19,7 +19,7 @@ makeevrserg.java.ktarget=17
 # Project
 makeevrserg.project.name=MiKro
 makeevrserg.project.group=ru.astrainteractive.klibs
-makeevrserg.project.version.string=1.7.0
+makeevrserg.project.version.string=1.8.0
 makeevrserg.project.description=Kotlin Multiplatform library with useful code
 makeevrserg.project.developers=makeevrserg|Makeev Roman|[email protected]
 makeevrserg.project.url=https://github.com/makeevrserg/kstorage

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,12 +1,13 @@
 [versions]
 # Kotlin
-kotlin-version = "1.9.23" # # https://github.com/JetBrains/kotlin
-kotlin-coroutines-core = "1.8.0" # https://github.com/Kotlin/kotlinx.coroutines
-makeevrserg-gradleplugin = "0.5.1" # https://github.com/makeevrserg/gradle-plugin
-gradle-android = "7.4.2" # https://developer.android.com/build#top-level
+kotlin-version = "2.0.0" # # https://github.com/JetBrains/kotlin
+kotlin-coroutines-core = "1.8.1" # https://github.com/Kotlin/kotlinx.coroutines
+makeevrserg-gradleplugin = "1.1.2" # https://github.com/makeevrserg/gradle-plugin
+gradle-android = "8.4.1" # https://developer.android.com/build#top-level
 decompose = "3.0.0" # https://github.com/arkivanov/Decompose
-kotlinx-datetime = "0.5.0" # https://github.com/Kotlin/kotlinx-datetime
+kotlinx-datetime = "0.6.0" # https://github.com/Kotlin/kotlinx-datetime
 moko-resources = "0.23.0" # https://github.com/icerockdev/moko-resources
+klibs-gradleplugin = "1.1.1" # https://github.com/makeevrserg/gradle-plugin
 [libraries]
 kotlin-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlin-coroutines-core" }
 makeevrserg-gradleplugin-convention = { module = "ru.astrainteractive.gradleplugin:convention", version.ref = "makeevrserg-gradleplugin" }
@@ -17,3 +18,18 @@ moko-resources = { module = "dev.icerock.moko:resources", version.ref = "moko-re
 [plugins]
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin-version" }
 gradle-android = { id = "com.android.library", version.ref = "gradle-android" }
+# klibs - core
+klibs-gradle-detekt = { id = "ru.astrainteractive.gradleplugin.detekt", version.ref = "klibs-gradleplugin" }
+klibs-gradle-detekt-compose = { id = "ru.astrainteractive.gradleplugin.detekt.compose", version.ref = "klibs-gradleplugin" }
+klibs-gradle-dokka-root = { id = "ru.astrainteractive.gradleplugin.dokka.root", version.ref = "klibs-gradleplugin" }
+klibs-gradle-dokka-module = { id = "ru.astrainteractive.gradleplugin.dokka.module", version.ref = "klibs-gradleplugin" }
+klibs-gradle-java-core = { id = "ru.astrainteractive.gradleplugin.java.core", version.ref = "klibs-gradleplugin" }
+klibs-gradle-stub-javadoc = { id = "ru.astrainteractive.gradleplugin.stub.javadoc", version.ref = "klibs-gradleplugin" }
+klibs-gradle-publication = { id = "ru.astrainteractive.gradleplugin.publication", version.ref = "klibs-gradleplugin" }
+klibs-gradle-rootinfo = { id = "ru.astrainteractive.gradleplugin.root.info", version.ref = "klibs-gradleplugin" }
+# klibs - android
+klibs-gradle-android-core = { id = "ru.astrainteractive.gradleplugin.android.core", version.ref = "klibs-gradleplugin" }
+klibs-gradle-android-compose = { id = "ru.astrainteractive.gradleplugin.android.compose", version.ref = "klibs-gradleplugin" }
+klibs-gradle-android-apk-sign = { id = "ru.astrainteractive.gradleplugin.android.apk.sign", version.ref = "klibs-gradleplugin" }
+klibs-gradle-android-apk-name = { id = "ru.astrainteractive.gradleplugin.android.apk.name", version.ref = "klibs-gradleplugin" }
+klibs-gradle-android-publication = { id = "ru.astrainteractive.gradleplugin.android.publication", version.ref = "klibs-gradleplugin" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/mikro-core/build.gradle.kts b/mikro-core/build.gradle.kts
@@ -1,4 +1,4 @@
-import ru.astrainteractive.gradleplugin.util.ProjectProperties.projectInfo
+import ru.astrainteractive.gradleplugin.property.extension.ModelPropertyValueExt.requireProjectInfo
 
 plugins {
     kotlin("multiplatform")
@@ -139,5 +139,5 @@ kotlin {
 }
 
 android {
-    namespace = "${projectInfo.group}.mikro.core"
+    namespace = "${requireProjectInfo.group}.mikro.core"
 }
diff --git a/mikro-extensions/build.gradle.kts b/mikro-extensions/build.gradle.kts
@@ -1,6 +1,7 @@
 @file:Suppress("UnusedPrivateMember")
 
-import ru.astrainteractive.gradleplugin.util.ProjectProperties.projectInfo
+import ru.astrainteractive.gradleplugin.property.extension.ModelPropertyValueExt.requireProjectInfo
+
 
 plugins {
     kotlin("multiplatform")
@@ -55,5 +56,5 @@ kotlin {
 }
 
 android {
-    namespace = "${projectInfo.group}.mikro.extensions"
+    namespace = "${requireProjectInfo.group}.mikro.extensions"
 }
diff --git a/mikro-locale/build.gradle.kts b/mikro-locale/build.gradle.kts
@@ -1,4 +1,4 @@
-import ru.astrainteractive.gradleplugin.util.ProjectProperties.projectInfo
+import ru.astrainteractive.gradleplugin.property.extension.ModelPropertyValueExt.requireProjectInfo
 
 plugins {
     kotlin("multiplatform")
@@ -128,5 +128,5 @@ kotlin {
 }
 
 android {
-    namespace = "${projectInfo.group}.lokale"
+    namespace = "${requireProjectInfo.group}.lokale"
 }
diff --git a/mikro-platform/build.gradle.kts b/mikro-platform/build.gradle.kts
@@ -1,4 +1,4 @@
-import ru.astrainteractive.gradleplugin.util.ProjectProperties.projectInfo
+import ru.astrainteractive.gradleplugin.property.extension.ModelPropertyValueExt.requireProjectInfo
 
 plugins {
     kotlin("multiplatform")
@@ -142,5 +142,5 @@ kotlin {
 }
 
 android {
-    namespace = "${projectInfo.group}.mikro.platform"
+    namespace = "${requireProjectInfo.group}.mikro.platform"
 }
diff --git a/mikro-validation/build.gradle.kts b/mikro-validation/build.gradle.kts
@@ -1,4 +1,4 @@
-import ru.astrainteractive.gradleplugin.util.ProjectProperties.projectInfo
+import ru.astrainteractive.gradleplugin.property.extension.ModelPropertyValueExt.requireProjectInfo
 
 plugins {
     kotlin("multiplatform")
@@ -139,5 +139,5 @@ kotlin {
 }
 
 android {
-    namespace = "${projectInfo.group}.validation"
+    namespace = "${requireProjectInfo.group}.validation"
 }