diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 9ec4ed4..6ef1840 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -33,11 +33,12 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' + cache: 'gradle' - name: Download changelog uses: actions/download-artifact@v3 @@ -52,6 +53,8 @@ jobs: env: USERNAME: ${{ github.actor }} TOKEN: ${{ secrets.GITHUB_TOKEN }} + CS_USERNAME: "codedsakura" + CS_TOKEN: ${{ secrets.CODEDSAKURA_MAVEN_TOKEN }} MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} CHANGELOG_PATH: "./changelog.out.md" diff --git a/CHANGELOG.md b/CHANGELOG.md index a2c5610..d48f8f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 2.0.3 + +* Update to support 1.20.6 +* Switch to self-hosted maven + # 2.0.2 * Update to support 1.20.4 diff --git a/build.gradle b/build.gradle index dc50c5c..828d2a7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.4-SNAPSHOT' + id 'fabric-loom' version '1.6-SNAPSHOT' id 'maven-publish' id "com.modrinth.minotaur" version "2.+" } @@ -10,15 +10,9 @@ group = project.maven_group repositories { mavenLocal() - maven { - url "https://maven.pkg.github.com/BlossomMods/BlossomLib" - credentials { - username = System.getenv("USERNAME") - password = System.getenv("TOKEN") - } - } maven { url "https://maven.nucleoid.xyz" } maven { url 'https://oss.sonatype.org/content/repositories/snapshots' } + maven { url "https://maven.codedsakura.dev/releases" } } dependencies { @@ -76,6 +70,14 @@ publishing { password = System.getenv("TOKEN") } } + maven { + name = "codedsakuraMavenReleases" + url = uri("https://maven.codedsakura.dev/releases") + credentials { + username = System.getenv("CS_USERNAME") + password = System.getenv("CS_TOKEN") + } + } } } diff --git a/gradle.properties b/gradle.properties index 433cd7f..f49cccd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,17 +2,17 @@ org.gradle.jvmargs=-Xmx1G # Mod Properties -mod_version=2.0.2 +mod_version=2.0.3 maven_group=dev.codedsakura.blossom mod_slug=BlossomPVP archives_base_name=blossom-pvp -supported_versions=1.20.4 +supported_versions=1.20.6 # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.20.4 +minecraft_version=1.20.6 yarn_mappings=build.1 -loader_version=0.15.1 +loader_version=0.15.11 # Dependencies -blossomlib_version=2.5.6 +blossomlib_version=2.5.7 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a595206..48c0a02 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-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists