diff --git a/.github/workflows/detekt-validation.yml b/.github/workflows/call-detekt-validation.yml similarity index 93% rename from .github/workflows/detekt-validation.yml rename to .github/workflows/call-detekt-validation.yml index 3424e84..3fdfb0f 100644 --- a/.github/workflows/detekt-validation.yml +++ b/.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/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/call-gradle-wrapper-validation.yml similarity index 100% rename from .github/workflows/gradle-wrapper-validation.yml rename to .github/workflows/call-gradle-wrapper-validation.yml diff --git a/.github/workflows/tests-validation.yml b/.github/workflows/call-tests-validation.yml similarity index 93% rename from .github/workflows/tests-validation.yml rename to .github/workflows/call-tests-validation.yml index 859bb44..3000a4a 100644 --- a/.github/workflows/tests-validation.yml +++ b/.github/workflows/call-tests-validation.yml @@ -18,4 +18,4 @@ jobs: - name: Run tests uses: gradle/gradle-build-action@v3 with: - arguments: test \ No newline at end of file + arguments: allTests \ No newline at end of file diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index 1f85251..0c117e5 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -21,10 +21,10 @@ 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 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5c8c924..b8109a2 100644 --- 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 index e700b4e..ea2033a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,9 @@ .gradle .idea +.kotlin build mikro-core/build mikro-platform/build mikro-locale/build -local.properties \ No newline at end of file +local.properties +kotlin-js-store/* \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9ff4a68..b50d009 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ # Kotlin 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.1" # https://github.com/makeevrserg/gradle-plugin +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.6.0" # https://github.com/Kotlin/kotlinx-datetime diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 743153f..c674402 100644 --- 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 \ No newline at end of file diff --git a/mikro-core/build.gradle.kts b/mikro-core/build.gradle.kts index b0855ad..282683b 100644 --- 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 index 2bd2669..ac01794 100644 --- 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 index ed3e097..9b898bd 100644 --- 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 index 27a0e6f..30af767 100644 --- 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 index d4ad40c..35c4c41 100644 --- 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" }