From 8958c8c36b6c29e47c6fad0b41b9a5d6752ff7a8 Mon Sep 17 00:00:00 2001 From: Sean Gilligan Date: Wed, 5 Jan 2022 00:21:32 -0800 Subject: [PATCH] =?UTF-8?q?Github=20Packages=20broke=20the=20release,=20le?= =?UTF-8?q?t=E2=80=99s=20fix=20that.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Remove vestigial Github from publishing block in `maven-publish.gradle` 2. Make app versions 1.0 + library version to minimize human error 3. Update CHANGELOG.adoc 4. Update release-process.adoc --- CHANGELOG.adoc | 2 ++ doc/release-process.adoc | 8 ++++++++ gradle.properties | 4 ++-- gradle/maven-publish.gradle | 8 -------- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index 713a690..12e5821 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -23,6 +23,8 @@ Released: 2022-01-04 * Micronaut Test (Spock) 3.0.5 * GitLab CI build now uses `openjdk-17-jdk` * Travis CI build removed +* Remove vestigial (and problematic) references to Github Maven repos in `publishing` block in `maven-publish.gradle` +* Sample Apps are now version 1.4.0 and will henceforth be `1.0` plus the Supernaut.FX version. == v0.3.1 diff --git a/doc/release-process.adoc b/doc/release-process.adoc index b063421..7de5001 100644 --- a/doc/release-process.adoc +++ b/doc/release-process.adoc @@ -22,6 +22,14 @@ .. `./gradlew publishSite` . Create GitHub Release +== Sample App Versions + +* Sample app versions are `1.0` + the Supernaut.FX version +* Sample app versions are bumped when work on next release begins and _should_ never contain `-SNAPSHOT`. +* These differences are required by limitations of the `jpackage` process. (some tools require 1.0 or later, others forbid a `-SNAPSHOT` in the version string.) + +NOTE:: We need to stop publishing sample apps to Maven repos. + == Updating Gradle Dependency Verification configuration NOTE:: We are not using Dependency Verification yet, but we did try to use it. diff --git a/gradle.properties b/gradle.properties index 87afa98..47931e9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ supernautVersion = 0.4.0 -helloAppVersion = 1.1.7 -testAppVersion = 1.1.7 +helloAppVersion = 1.4.0 +testAppVersion = 1.4.0 signJPackageImages = false # Major (whole number) version of JDK to use for javac, jlink, jpackage, etc. diff --git a/gradle/maven-publish.gradle b/gradle/maven-publish.gradle index d3617bb..5d27015 100644 --- a/gradle/maven-publish.gradle +++ b/gradle/maven-publish.gradle @@ -15,14 +15,6 @@ subprojects { header(HttpHeaderAuthentication) } } - maven { - name = "SupernautAppGitHubPackages" - url = "https://maven.pkg.github.com/SupernautApp/SupernautFX" - credentials { - username = project.findProperty("supernaut.github.user") ?: System.getenv("GITHUB_ACTOR") - password = project.findProperty("supernaut.github.key") ?: System.getenv("GITHUB_TOKEN") - } - } } publications { jar(MavenPublication) {