From c969f5f9531e6ad6a159ca51f4478f6cc0dd4394 Mon Sep 17 00:00:00 2001 From: Thomas <1688389+Rakambda@users.noreply.github.com> Date: Thu, 11 Apr 2024 13:11:45 +0200 Subject: [PATCH 1/7] Update gradle.properties --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b0bbea50..eb3d98a0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=2.2.13 +version=2.2.14 From 2fee67f73f5d0850ff7809a355d597dfabb08abf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 09:10:14 +0200 Subject: [PATCH 2/7] chore(deps): update gradle/actions action to v3.3.0 (#754) --- .github/workflows/build-test-deploy.yml | 12 ++++++------ .github/workflows/manual-docker.yml | 4 ++-- .github/workflows/release.yml | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index 9b5f263e..e26bd73f 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -27,7 +27,7 @@ jobs: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} - name: Generate and submit dependency graph - uses: gradle/actions/dependency-submission@v3.2.0 + uses: gradle/actions/dependency-submission@v3.3.0 continue-on-error: true build: @@ -45,7 +45,7 @@ jobs: java-version: ${{ vars.JAVA_VERSION }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.2.0 + uses: gradle/actions/setup-gradle@v3.3.0 - name: Build project run: | ./gradlew \ @@ -86,7 +86,7 @@ jobs: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.2.0 + uses: gradle/actions/setup-gradle@v3.3.0 - name: Run tests run: | @@ -150,7 +150,7 @@ jobs: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.2.0 + uses: gradle/actions/setup-gradle@v3.3.0 - name: Run tests run: | @@ -214,7 +214,7 @@ jobs: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.2.0 + uses: gradle/actions/setup-gradle@v3.3.0 - name: Calculate miner image name id: miner-image-name @@ -244,7 +244,7 @@ jobs: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.2.0 + uses: gradle/actions/setup-gradle@v3.3.0 - name: Calculate viewer image name id: viewer-image-name diff --git a/.github/workflows/manual-docker.yml b/.github/workflows/manual-docker.yml index bb2ab85f..03a56924 100644 --- a/.github/workflows/manual-docker.yml +++ b/.github/workflows/manual-docker.yml @@ -17,7 +17,7 @@ jobs: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.2.0 + uses: gradle/actions/setup-gradle@v3.3.0 - name: Calculate miner image name id: miner-image-name @@ -53,7 +53,7 @@ jobs: distribution: 'temurin' java-version: ${{ env.APP_JAVA_VERSION }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.2.0 + uses: gradle/actions/setup-gradle@v3.3.0 - name: Calculate viewer image name id: viewer-image-name diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f756a7e8..7fdfdc6e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.2.0 + uses: gradle/actions/setup-gradle@v3.3.0 - name: Push latest on Docker Hub run: | @@ -42,7 +42,7 @@ jobs: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.2.0 + uses: gradle/actions/setup-gradle@v3.3.0 - name: Push latest on Docker Hub run: | @@ -66,7 +66,7 @@ jobs: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.2.0 + uses: gradle/actions/setup-gradle@v3.3.0 - name: Build project run: | From a4c67ecabd243c8e66b836949f7a7fab5e44302d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 09:10:57 +0200 Subject: [PATCH 3/7] chore(deps): update codecov/codecov-action action to v4.3.0 (#753) --- .github/workflows/build-test-deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index e26bd73f..b9502fa5 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -105,7 +105,7 @@ jobs: with: report_paths: 'miner/build/test-results/test/*.xml' - name: Publish coverage on CodeCov - uses: codecov/codecov-action@v4.2.0 + uses: codecov/codecov-action@v4.3.0 if: always() with: token: ${{ secrets.CODECOV_TOKEN }} @@ -169,7 +169,7 @@ jobs: with: report_paths: 'viewer/build/test-results/test/*.xml' - name: Publish coverage on CodeCov - uses: codecov/codecov-action@v4.2.0 + uses: codecov/codecov-action@v4.3.0 if: always() with: token: ${{ secrets.CODECOV_TOKEN }} From ed116a34b173a2e82c6da94d8e2708fbede5d0dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 07:17:01 +0200 Subject: [PATCH 4/7] chore(deps): bump org.slf4j:slf4j-api from 2.0.12 to 2.0.13 (#755) --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index db4820a6..ef4a324b 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -slf4j-version = "2.0.12" +slf4j-version = "2.0.13" log4j2-version = "2.23.1" log4j2-slf4j-version = "2.23.1" unirest-version = "4.2.9" From d72cd95ee8d450ba056a2de0e81a650164029888 Mon Sep 17 00:00:00 2001 From: Thomas Couchoud <1688389+Rakambda@users.noreply.github.com> Date: Wed, 17 Apr 2024 21:44:35 +0200 Subject: [PATCH 5/7] Fix content id missing a value --- gradle/wrapper/gradle-wrapper.properties | 2 +- .../CommunityPointsLastViewedContentByTypeAndID.java | 2 +- .../miner/api/gql/gql/data/types/ContentId.java | 10 ---------- .../api/ws/data/message/subtype/LastViewedContent.java | 3 +-- .../api/gql/gql/GQLApiChannelPointsContextTest.java | 3 +-- 5 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/data/types/ContentId.java diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23a..1466d0a7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-8.8-20240412020704+0000-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/data/types/CommunityPointsLastViewedContentByTypeAndID.java b/miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/data/types/CommunityPointsLastViewedContentByTypeAndID.java index 08cf7ed9..469f3081 100644 --- a/miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/data/types/CommunityPointsLastViewedContentByTypeAndID.java +++ b/miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/data/types/CommunityPointsLastViewedContentByTypeAndID.java @@ -23,7 +23,7 @@ public class CommunityPointsLastViewedContentByTypeAndID extends GQLType{ @JsonProperty("contentID") @NotNull - private ContentId contentId; + private String contentId; @JsonProperty("contentType") @NotNull private ContentType contentType; diff --git a/miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/data/types/ContentId.java b/miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/data/types/ContentId.java deleted file mode 100644 index a5c53b58..00000000 --- a/miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/data/types/ContentId.java +++ /dev/null @@ -1,10 +0,0 @@ -package fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types; - -public enum ContentId{ - SEND_ANIMATED_MESSAGE, - SINGLE_MESSAGE_BYPASS_SUB_MODE, - SEND_HIGHLIGHTED_MESSAGE, - RANDOM_SUB_EMOTE_UNLOCK, - CHOSEN_SUB_EMOTE_UNLOCK, - CHOSEN_MODIFIED_SUB_EMOTE_UNLOCK -} diff --git a/miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/ws/data/message/subtype/LastViewedContent.java b/miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/ws/data/message/subtype/LastViewedContent.java index ff64b9c6..151c3919 100644 --- a/miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/ws/data/message/subtype/LastViewedContent.java +++ b/miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/ws/data/message/subtype/LastViewedContent.java @@ -2,7 +2,6 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.ContentId; import fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.ContentType; import fr.rakambda.channelpointsminer.miner.util.json.ISO8601ZonedDateTimeDeserializer; import lombok.EqualsAndHashCode; @@ -23,7 +22,7 @@ public class LastViewedContent{ private ContentType contentType; @JsonProperty("content_id") @NotNull - private ContentId contentId; + private String contentId; @JsonProperty("last_viewed_at") @JsonDeserialize(using = ISO8601ZonedDateTimeDeserializer.class) @Nullable diff --git a/miner/src/test/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/GQLApiChannelPointsContextTest.java b/miner/src/test/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/GQLApiChannelPointsContextTest.java index 5c57260d..58732936 100644 --- a/miner/src/test/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/GQLApiChannelPointsContextTest.java +++ b/miner/src/test/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/GQLApiChannelPointsContextTest.java @@ -30,7 +30,6 @@ import java.time.ZonedDateTime; import java.util.List; import java.util.Map; -import static fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.ContentId.SINGLE_MESSAGE_BYPASS_SUB_MODE; import static fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.ContentType.AUTOMATIC_REWARD; import static fr.rakambda.channelpointsminer.miner.api.gql.gql.data.types.ContentType.CUSTOM_REWARD; import static java.time.ZoneOffset.UTC; @@ -156,7 +155,7 @@ void nominal() throws MalformedURLException{ .communityPoints(CommunityPointsUserProperties.builder() .lastViewedContent(List.of( CommunityPointsLastViewedContentByTypeAndID.builder() - .contentId(SINGLE_MESSAGE_BYPASS_SUB_MODE) + .contentId("SINGLE_MESSAGE_BYPASS_SUB_MODE") .contentType(AUTOMATIC_REWARD) .lastViewedAt(ZonedDateTime.of(2021, 10, 6, 19, 50, 35, 443714534, UTC)) .build() From e06b78c43949f2bf2241131dfa2718b96e4921b3 Mon Sep 17 00:00:00 2001 From: Thomas Couchoud <1688389+Rakambda@users.noreply.github.com> Date: Wed, 17 Apr 2024 21:55:21 +0200 Subject: [PATCH 6/7] fix test --- .../miner/api/gql/gql/GQLApiChannelPointsContextTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/miner/src/test/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/GQLApiChannelPointsContextTest.java b/miner/src/test/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/GQLApiChannelPointsContextTest.java index 58732936..7a9bd37a 100644 --- a/miner/src/test/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/GQLApiChannelPointsContextTest.java +++ b/miner/src/test/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/GQLApiChannelPointsContextTest.java @@ -295,7 +295,7 @@ void nominalWithClaim(UnirestMock unirest) throws MalformedURLException{ .communityPoints(CommunityPointsUserProperties.builder() .lastViewedContent(List.of( CommunityPointsLastViewedContentByTypeAndID.builder() - .contentId(SINGLE_MESSAGE_BYPASS_SUB_MODE) + .contentId("SINGLE_MESSAGE_BYPASS_SUB_MODE") .contentType(AUTOMATIC_REWARD) .lastViewedAt(ZonedDateTime.of(2021, 10, 6, 19, 50, 35, 443714534, UTC)) .build() From bd97a7ced1eabb3bfafb1d9727d53a160cd7afc1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 Apr 2024 11:16:46 +0200 Subject: [PATCH 7/7] chore(deps): update gradle/actions action to v3.3.1 (#756) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/build-test-deploy.yml | 12 ++++++------ .github/workflows/manual-docker.yml | 4 ++-- .github/workflows/release.yml | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml index b9502fa5..e883b73d 100644 --- a/.github/workflows/build-test-deploy.yml +++ b/.github/workflows/build-test-deploy.yml @@ -27,7 +27,7 @@ jobs: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} - name: Generate and submit dependency graph - uses: gradle/actions/dependency-submission@v3.3.0 + uses: gradle/actions/dependency-submission@v3.3.1 continue-on-error: true build: @@ -45,7 +45,7 @@ jobs: java-version: ${{ vars.JAVA_VERSION }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.3.0 + uses: gradle/actions/setup-gradle@v3.3.1 - name: Build project run: | ./gradlew \ @@ -86,7 +86,7 @@ jobs: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.3.0 + uses: gradle/actions/setup-gradle@v3.3.1 - name: Run tests run: | @@ -150,7 +150,7 @@ jobs: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.3.0 + uses: gradle/actions/setup-gradle@v3.3.1 - name: Run tests run: | @@ -214,7 +214,7 @@ jobs: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.3.0 + uses: gradle/actions/setup-gradle@v3.3.1 - name: Calculate miner image name id: miner-image-name @@ -244,7 +244,7 @@ jobs: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.3.0 + uses: gradle/actions/setup-gradle@v3.3.1 - name: Calculate viewer image name id: viewer-image-name diff --git a/.github/workflows/manual-docker.yml b/.github/workflows/manual-docker.yml index 03a56924..6ab4f677 100644 --- a/.github/workflows/manual-docker.yml +++ b/.github/workflows/manual-docker.yml @@ -17,7 +17,7 @@ jobs: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.3.0 + uses: gradle/actions/setup-gradle@v3.3.1 - name: Calculate miner image name id: miner-image-name @@ -53,7 +53,7 @@ jobs: distribution: 'temurin' java-version: ${{ env.APP_JAVA_VERSION }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.3.0 + uses: gradle/actions/setup-gradle@v3.3.1 - name: Calculate viewer image name id: viewer-image-name diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7fdfdc6e..360acd36 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.3.0 + uses: gradle/actions/setup-gradle@v3.3.1 - name: Push latest on Docker Hub run: | @@ -42,7 +42,7 @@ jobs: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.3.0 + uses: gradle/actions/setup-gradle@v3.3.1 - name: Push latest on Docker Hub run: | @@ -66,7 +66,7 @@ jobs: distribution: 'temurin' java-version: ${{ vars.JAVA_VERSION }} - name: Setup Gradle - uses: gradle/actions/setup-gradle@v3.3.0 + uses: gradle/actions/setup-gradle@v3.3.1 - name: Build project run: |