From dc6a8d27d1d03651ad79a5b1a34cd5876cee3970 Mon Sep 17 00:00:00 2001 From: Georgii Ippolitov Date: Sun, 21 Sep 2025 11:58:12 +0300 Subject: [PATCH 1/5] Update dependencies --- build.gradle.kts | 4 ++-- catalog.toml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6d669b3..aa7018e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,8 +5,8 @@ version = "1.0.0" plugins { alias(notation = catalog.plugins.g000sha256.sonatypeMavenCentral) + alias(notation = catalog.plugins.gradle.javaGradlePlugin) alias(notation = catalog.plugins.gradle.mavenPublish) - alias(notation = catalog.plugins.gradle.plugin) alias(notation = catalog.plugins.gradle.signing) alias(notation = catalog.plugins.jetBrains.binaryCompatibilityValidator) alias(notation = catalog.plugins.jetBrains.kotlin) @@ -59,7 +59,7 @@ publishing { "pluginMaven" -> { name = "Gradle Module Tree plugin" description = "A Gradle settings plugin that provides a hierarchical DSL for organizing and " + - "auto-creating multi-module project structures" + "auto-creating multi-module project structures" } else -> error(message = "Unknown publication") } diff --git a/catalog.toml b/catalog.toml index 78b7bfd..0dc29d6 100644 --- a/catalog.toml +++ b/catalog.toml @@ -1,13 +1,13 @@ [versions] annotations = "26.0.2" binaryCompatibilityValidator = "0.18.1" -kotlin = "2.2.10" -sonatypeMavenCentral = "1.0.0" +kotlin = "2.2.20" +sonatypeMavenCentral = "1.1.0" [plugins] g000sha256-sonatypeMavenCentral = { id = "dev.g000sha256.sonatype-maven-central", version.ref = "sonatypeMavenCentral" } +gradle-javaGradlePlugin = { id = "org.gradle.java-gradle-plugin" } gradle-mavenPublish = { id = "org.gradle.maven-publish" } -gradle-plugin = { id = "org.gradle.java-gradle-plugin" } gradle-signing = { id = "org.gradle.signing" } jetBrains-binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binaryCompatibilityValidator" } jetBrains-kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } From 1cdee168f951fbd10a9d1b6902a1c4bad435f3fa Mon Sep 17 00:00:00 2001 From: Georgii Ippolitov Date: Sun, 21 Sep 2025 11:58:53 +0300 Subject: [PATCH 2/5] Update workflows --- .github/workflows/build-and-publish.yml | 4 ++-- .github/workflows/build.yml | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 5a30f1c..1e81f54 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -18,8 +18,8 @@ jobs: - name: Setup Java uses: actions/setup-java@v4 with: - java-version: 17 distribution: temurin + java-version: 17 - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 @@ -29,7 +29,7 @@ jobs: - name: Assemble run: ./gradlew assemble - - name: Check API compatibility + - name: Check binary compatibility run: ./gradlew apiCheck - name: Publish diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 42c56b5..657b99e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,9 +1,13 @@ name: Build on: - push: + pull_request: branches: - - main + - develop + - master + types: + - opened + - synchronize jobs: build: @@ -18,8 +22,8 @@ jobs: - name: Setup Java uses: actions/setup-java@v4 with: - java-version: 17 distribution: temurin + java-version: 17 - name: Setup Gradle uses: gradle/actions/setup-gradle@v4 @@ -29,5 +33,5 @@ jobs: - name: Assemble run: ./gradlew assemble - - name: Check API compatibility + - name: Check binary compatibility run: ./gradlew apiCheck From e4c65575863f2914d56c2a026007d338f1734d7f Mon Sep 17 00:00:00 2001 From: Georgii Ippolitov Date: Sun, 21 Sep 2025 12:10:52 +0300 Subject: [PATCH 3/5] Downgrade Java version from 17 to 11 --- build.gradle.kts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index aa7018e..de11bc7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,8 +13,8 @@ plugins { } java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 withJavadocJar() withSourcesJar() @@ -24,7 +24,7 @@ kotlin { explicitApi() compilerOptions { - jvmTarget = JvmTarget.JVM_17 + jvmTarget = JvmTarget.JVM_11 moduleName = "dev.g000sha256.gradle_module_tree" } } From e3725d1b7bdf4b86a3919d9231dcb472bd21e51b Mon Sep 17 00:00:00 2001 From: Georgii Ippolitov Date: Sun, 21 Sep 2025 12:11:28 +0300 Subject: [PATCH 4/5] Update project configuration --- build.gradle.kts | 20 +++++--------------- gradle.properties | 3 ++- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index de11bc7..960cb1e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -49,20 +49,10 @@ gradlePlugin { publishing { publications { withType { - val mavenPublication = this pom { - when (mavenPublication.name) { - "releasePluginMarkerMaven" -> { - name = "Gradle Module Tree plugin marker" - description = "Plugin marker artifact for the Gradle Module Tree plugin" - } - "pluginMaven" -> { - name = "Gradle Module Tree plugin" - description = "A Gradle settings plugin that provides a hierarchical DSL for organizing and " + - "auto-creating multi-module project structures" - } - else -> error(message = "Unknown publication") - } + name = "Gradle Module Tree plugin" + description = "A Gradle settings plugin that provides a hierarchical DSL " + + "for organizing and auto-creating multi-module project structures" url = "https://github.com/g000sha256/gradle-module-tree" inceptionYear = "2025" @@ -85,8 +75,8 @@ publishing { scm { connection = "scm:git:git://github.com/g000sha256/gradle-module-tree.git" - developerConnection = "scm:git:ssh://github.com:g000sha256/gradle-module-tree.git" - url = "https://github.com/g000sha256/gradle-module-tree/tree/master" + developerConnection = "scm:git:git@github.com:g000sha256/gradle-module-tree.git" + url = "https://github.com/g000sha256/gradle-module-tree" } issueManagement { diff --git a/gradle.properties b/gradle.properties index 241cc98..25e85c7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,2 @@ -org.gradle.jvmargs=-Xmx4096M +# Gradle +org.gradle.jvmargs=-Xmx4G From ed172266911518d61310f5ef64951e33d9201dd1 Mon Sep 17 00:00:00 2001 From: Georgii Ippolitov Date: Sun, 21 Sep 2025 12:29:24 +0300 Subject: [PATCH 5/5] Version 1.1.0 --- README.md | 2 +- build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ab02176..798bcb9 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Add the plugin to your `settings.gradle.kts` file: ```kotlin plugins { - id(id = "dev.g000sha256.gradle-module-tree") version "1.0.0" + id(id = "dev.g000sha256.gradle-module-tree") version "1.1.0" } ``` diff --git a/build.gradle.kts b/build.gradle.kts index 960cb1e..a7e63c6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget group = "dev.g000sha256" -version = "1.0.0" +version = "1.1.0" plugins { alias(notation = catalog.plugins.g000sha256.sonatypeMavenCentral)