Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -29,7 +29,7 @@ jobs:
- name: Assemble
run: ./gradlew assemble

- name: Check API compatibility
- name: Check binary compatibility
run: ./gradlew apiCheck

- name: Publish
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
name: Build

on:
push:
pull_request:
branches:
- main
- develop
- master
types:
- opened
- synchronize

jobs:
build:
Expand All @@ -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
Expand All @@ -29,5 +33,5 @@ jobs:
- name: Assemble
run: ./gradlew assemble

- name: Check API compatibility
- name: Check binary compatibility
run: ./gradlew apiCheck
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
```

Expand Down
30 changes: 10 additions & 20 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
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)
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)
}

java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11

withJavadocJar()
withSourcesJar()
Expand All @@ -24,7 +24,7 @@ kotlin {
explicitApi()

compilerOptions {
jvmTarget = JvmTarget.JVM_17
jvmTarget = JvmTarget.JVM_11
moduleName = "dev.g000sha256.gradle_module_tree"
}
}
Expand All @@ -49,20 +49,10 @@ gradlePlugin {
publishing {
publications {
withType<MavenPublication> {
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"
Expand All @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions catalog.toml
Original file line number Diff line number Diff line change
@@ -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" }
Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
org.gradle.jvmargs=-Xmx4096M
# Gradle
org.gradle.jvmargs=-Xmx4G