Shipkit release test

Author: LunNova

.github/workflows/ci.yml

@@ -35,7 +35,6 @@ jobs:
               uses: actions/setup-java@v1
               with:
                   java-version: ${{ matrix.jdk }}
-            - run: chmod +x gradlew
             - run: ./gradlew build --stacktrace --warning-mode all
 
     release:
@@ -45,6 +44,7 @@ jobs:
         if: github.event_name == 'push'
             && github.ref == 'refs/heads/main'
             && github.repository == 'MinimallyCorrect/JavaTransformer'
+            && !contains(toJSON(github.event.commits.*.message), '[skip ci]')
             && !contains(toJSON(github.event.commits.*.message), '[skip release]')
 
         steps:
@@ -59,11 +59,9 @@ jobs:
                   java-version: 11
 
             - name: Build and publish to github
-              run: ./gradlew -P releasing publish publishPlugins githubRelease -s
+              run: ./gradlew -P releasing build publish githubRelease -s
               env:
                   GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-                  GRADLE_PUBLISH_KEY: ${{secrets.GRADLE_PUBLISH_KEY}}
-                  GRADLE_PUBLISH_SECRET: ${{secrets.GRADLE_PUBLISH_SECRET}}
                   DEPLOYMENT_REPO_URL_RELEASE: ${{secrets.DEPLOYMENT_REPO_URL_RELEASE}}
                   DEPLOYMENT_REPO_URL_SNAPSHOT: ${{secrets.DEPLOYMENT_REPO_URL_SNAPSHOT}}
                   DEPLOYMENT_REPO_USERNAME: ${{secrets.DEPLOYMENT_REPO_USERNAME}}

build.gradle.kts

@@ -1,11 +1,21 @@
 plugins {
+	id("base")
 	id("java")
 	id("java-library")
 	id("maven-publish")
-	id("dev.minco.gradle.defaults-plugin") version "0.2.4"
+	id("dev.minco.gradle.defaults-plugin") version "0.2.8"
+	id("org.shipkit.shipkit-auto-version") version "1.1.1"
+	id("org.shipkit.shipkit-changelog") version "1.1.4"
+	id("org.shipkit.shipkit-github-release") version "1.1.4"
 }
 
 apply(from = "properties.gradle")
+apply(from = "$rootDir/gradle/shipkit.gradle")
+
+val releasing = project.hasProperty("releasing")
+if (!releasing) {
+	version = "$version-SNAPSHOT"
+}
 
 repositories {
 	exclusiveContent {
@@ -21,9 +31,8 @@ repositories {
 	mavenCentral()
 }
 
-minimallyCorrectDefaults {
-	configureProject(project)
-}
+minimallyCorrectDefaults.languageLevel = JavaVersion.VERSION_11
+minimallyCorrectDefaults.configureProject(project)
 
 dependencies {
 	testImplementation("junit:junit:4.13.2")

gradle/shipkit.gradle

@@ -1,3 +1,15 @@
-// Auto-generated by https://github.com/MinimallyCorrect/DefaultsPlugin
+tasks.named("mincoGenerateChangelog") {
+	version.value("" + project.version)
+	githubUrl.value(project.ext["githubUrl"] as String)
+	outputFile.fileValue(project.file("$buildDir/changelog.md"))
+	fromRevision.value(project.ext["shipkit-auto-version.previous-tag"] as String)
+}
 
-minimallyCorrectDefaultsShipkit {} ()
+tasks.named("githubRelease") {
+	def genTask = tasks.named("mincoGenerateChangelog").get()
+	dependsOn(genTask)
+	repository = project.ext["githubOwnerProject"] as String
+	changelog = genTask.outputFile.get().getAsFile()
+	newTagRevision = System.getenv("GITHUB_SHA")
+	githubToken = System.getenv("GITHUB_TOKEN")
+}

properties.gradle

@@ -10,6 +10,3 @@ ext.githubOwnerProject = "${ext.githubOwner}/${ext.githubProject}".toString()
 ext.githubUrl = "https://github.com/${ext.githubOwnerProject}".toString()
 ext.website = ext.githubUrl
 ext.vcsUrl = "${ext.githubUrl}.git".toString()
-
-System.setProperty("gradle.publish.key", System.getenv("GRADLE_PUBLISH_KEY") ?: "")
-System.setProperty("gradle.publish.secret", System.getenv("GRADLE_PUBLISH_SECRET") ?: "")

version.properties

@@ -1,3 +1,3 @@
 #Version of the produced binaries. This file is intended to be checked-in.
 #It will be automatically bumped by release automation.
-version=1.9.x
+version=1.9.*