From 306372c35c624a87377fe28870aa2cdcfc5e80bd Mon Sep 17 00:00:00 2001 From: Awakened-Redstone <40528665+Awakened-Redstone@users.noreply.github.com> Date: Tue, 16 Jul 2024 20:54:40 -0300 Subject: [PATCH 1/6] update: Update to Twitch4J 1.21.0 Signed-off-by: Awakened-Redstone <40528665+Awakened-Redstone@users.noreply.github.com> --- build.gradle | 28 ++++++++++++++-------------- generated/minecraft_versions.txt | 3 +++ gradle.properties | 4 ++-- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index 47481f1..49e4f14 100644 --- a/build.gradle +++ b/build.gradle @@ -47,16 +47,16 @@ dependencies { include "com.apollographql.apollo:apollo-runtime:2.5.14" include "com.benasher44:uuid-jvm:0.2.0" include "com.bucket4j:bucket4j_jdk8-core:8.10.1" - include "com.fasterxml.jackson.core:jackson-annotations:2.17.0" - include "com.fasterxml.jackson.core:jackson-core:2.17.0" - include "com.fasterxml.jackson.core:jackson-databind:2.17.0" - include "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.0" - include "com.fasterxml.jackson:jackson-bom:2.17.0" + include "com.fasterxml.jackson.core:jackson-annotations:2.17.2" + include "com.fasterxml.jackson.core:jackson-core:2.17.2" + include "com.fasterxml.jackson.core:jackson-databind:2.17.2" + include "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.2" + include "com.fasterxml.jackson:jackson-bom:2.17.2" include "com.github.ben-manes.caffeine:caffeine:2.9.3" - include "com.github.philippheuer.credentialmanager:credentialmanager:0.3.0" - include "com.github.philippheuer.events4j:events4j-api:0.12.1" - include "com.github.philippheuer.events4j:events4j-bom:0.12.1" - include "com.github.philippheuer.events4j:events4j-core:0.12.1" + include "com.github.philippheuer.credentialmanager:credentialmanager:0.3.1" + include "com.github.philippheuer.events4j:events4j-api:0.12.2" + include "com.github.philippheuer.events4j:events4j-bom:0.12.2" + include "com.github.philippheuer.events4j:events4j-core:0.12.2" include "com.github.philippheuer.events4j:events4j-handler-simple:0.12.1" include "com.github.tony19:named-regexp:1.0.0" include "com.google.errorprone:error_prone_annotations:2.10.0" @@ -68,11 +68,11 @@ dependencies { include "com.squareup.okio:okio-jvm:3.6.0" include "commons-configuration:commons-configuration:1.10" include "commons-lang:commons-lang:2.6" - include "io.github.openfeign:feign-core:13.2.1" - include "io.github.openfeign:feign-hystrix:13.2.1" - include "io.github.openfeign:feign-jackson:13.2.1" - include "io.github.openfeign:feign-okhttp:13.2.1" - include "io.github.openfeign:feign-slf4j:13.2.1" + include "io.github.openfeign:feign-core:13.3" + include "io.github.openfeign:feign-hystrix:13.3" + include "io.github.openfeign:feign-jackson:13.3" + include "io.github.openfeign:feign-okhttp:13.3" + include "io.github.openfeign:feign-slf4j:13.3" include "io.github.xanthic.cache:cache-api:0.6.0" include "io.github.xanthic.cache:cache-core:0.6.0" include "io.github.xanthic.cache:cache-provider-caffeine:0.6.0" diff --git a/generated/minecraft_versions.txt b/generated/minecraft_versions.txt index 0baf07c..82693dc 100644 --- a/generated/minecraft_versions.txt +++ b/generated/minecraft_versions.txt @@ -1,3 +1,6 @@ +1.21 +1.20.6 +1.20.5 1.20.4 1.20.3 1.20.2 diff --git a/gradle.properties b/gradle.properties index 0b0df9b..f575707 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ yarn_mappings=1.18.2+build.2 loader_version=0.14.19 # Mod Properties -mod_version=1.6.0 -library_version=1.20.0 +mod_version=1.7.0 +library_version=1.21.0 maven_group=com.github.twitch4j archives_base_name=twitch4j-fabric From b2ccad45d74431e78784e41354c94130b3286975 Mon Sep 17 00:00:00 2001 From: Awakened-Redstone <40528665+Awakened-Redstone@users.noreply.github.com> Date: Sun, 22 Sep 2024 18:10:29 -0300 Subject: [PATCH 2/6] update: Update to Twitch4J 1.22.0 Signed-off-by: Awakened-Redstone <40528665+Awakened-Redstone@users.noreply.github.com> --- build.gradle | 16 ++++++++-------- gradle.properties | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 49e4f14..e277aa5 100644 --- a/build.gradle +++ b/build.gradle @@ -68,14 +68,14 @@ dependencies { include "com.squareup.okio:okio-jvm:3.6.0" include "commons-configuration:commons-configuration:1.10" include "commons-lang:commons-lang:2.6" - include "io.github.openfeign:feign-core:13.3" - include "io.github.openfeign:feign-hystrix:13.3" - include "io.github.openfeign:feign-jackson:13.3" - include "io.github.openfeign:feign-okhttp:13.3" - include "io.github.openfeign:feign-slf4j:13.3" - include "io.github.xanthic.cache:cache-api:0.6.0" - include "io.github.xanthic.cache:cache-core:0.6.0" - include "io.github.xanthic.cache:cache-provider-caffeine:0.6.0" + include "io.github.openfeign:feign-core:13.4" + include "io.github.openfeign:feign-hystrix:13.4" + include "io.github.openfeign:feign-jackson:13.4" + include "io.github.openfeign:feign-okhttp:13.4" + include "io.github.openfeign:feign-slf4j:13.4" + include "io.github.xanthic.cache:cache-api:0.6.1" + include "io.github.xanthic.cache:cache-core:0.6.1" + include "io.github.xanthic.cache:cache-provider-caffeine:0.6.1" include "io.reactivex:rxjava:1.2.0" include "net.fabricmc:fabric-language-kotlin:1.10.19+kotlin.1.9.23" include "org.hdrhistogram:HdrHistogram:2.1.9" diff --git a/gradle.properties b/gradle.properties index f575707..2ac3462 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ yarn_mappings=1.18.2+build.2 loader_version=0.14.19 # Mod Properties -mod_version=1.7.0 -library_version=1.21.0 +mod_version=1.8.0 +library_version=1.22.0 maven_group=com.github.twitch4j archives_base_name=twitch4j-fabric From e264841fc94f3935dcfa0e719582278d09e73c4b Mon Sep 17 00:00:00 2001 From: Awakened-Redstone <40528665+Awakened-Redstone@users.noreply.github.com> Date: Sun, 22 Sep 2024 18:19:20 -0300 Subject: [PATCH 3/6] chore: Fix outdated dep missed on some prior update Signed-off-by: Awakened-Redstone <40528665+Awakened-Redstone@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e277aa5..47ffa0e 100644 --- a/build.gradle +++ b/build.gradle @@ -57,7 +57,7 @@ dependencies { include "com.github.philippheuer.events4j:events4j-api:0.12.2" include "com.github.philippheuer.events4j:events4j-bom:0.12.2" include "com.github.philippheuer.events4j:events4j-core:0.12.2" - include "com.github.philippheuer.events4j:events4j-handler-simple:0.12.1" + include "com.github.philippheuer.events4j:events4j-handler-simple:0.12.2" include "com.github.tony19:named-regexp:1.0.0" include "com.google.errorprone:error_prone_annotations:2.10.0" include "com.neovisionaries:nv-websocket-client:2.14" From c4c98ceeb4db9c3611c37195634e03223cb24771 Mon Sep 17 00:00:00 2001 From: Awakened-Redstone <40528665+Awakened-Redstone@users.noreply.github.com> Date: Sun, 22 Sep 2024 21:28:47 -0300 Subject: [PATCH 4/6] chore: Add github actions This should work right? Signed-off-by: Awakened-Redstone <40528665+Awakened-Redstone@users.noreply.github.com> --- .github/workflows/release.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..a789bfe --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,28 @@ +name: Publish mod + +on: + push: + branches: [ "main" ] + +permissions: + contents: write + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - name: Set up JDK 21 + uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0 + with: + java-version: '21' + distribution: 'temurin' + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - run: ./gradlew build modrinth + env: + MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} + - run: ./gradlew build publish + env: + MAVEN_REPO: ${{ secrets.MAVEN_REPO }} + MAVEN_AUTH_HEADER: ${{ secrets.MAVEN_AUTH_HEADER }} + MAVEN_AUTH_TOKEN: ${{ secrets.MAVEN_AUTH_TOKEN }} From 7ced429863c85bdd9909329674f28ec1b7e1aa31 Mon Sep 17 00:00:00 2001 From: Awakened Redstone <40528665+Awakened-Redstone@users.noreply.github.com> Date: Sun, 22 Sep 2024 22:17:43 -0300 Subject: [PATCH 5/6] chore: Use correct action Co-authored-by: iProdigy <8106344+iProdigy@users.noreply.github.com> --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a789bfe..5df54f2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: with: java-version: '21' distribution: 'temurin' - - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 + - uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808 # v4.1.0 - run: ./gradlew build modrinth env: MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }} From 75374d07f6e431fd0dee445118044b2b9ae29da4 Mon Sep 17 00:00:00 2001 From: Awakened-Redstone <40528665+Awakened-Redstone@users.noreply.github.com> Date: Sun, 22 Sep 2024 23:50:04 -0300 Subject: [PATCH 6/6] chore: Reduce permission Signed-off-by: Awakened-Redstone <40528665+Awakened-Redstone@users.noreply.github.com> --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a789bfe..7c11087 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,7 +5,7 @@ on: branches: [ "main" ] permissions: - contents: write + contents: read jobs: build: