Merge pull request #757 from RakambdaOrg/develop

2.2.14
RakambdaOrg · Apr 20, 2024 · ffaf775 · ffaf775
2 parents 9619e01 + bd97a7c
commit ffaf775
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 32 deletions.
diff --git 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.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.2.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.2.0
+        uses: gradle/actions/setup-gradle@v3.3.1
 
       - name: Run tests
         run: |
@@ -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 }}
@@ -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.1
 
       - name: Run tests
         run: |
@@ -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 }}
@@ -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.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.2.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
@@ -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.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.2.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
@@ -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.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.2.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.2.0
+        uses: gradle/actions/setup-gradle@v3.3.1
 
       - name: Build project
         run: |

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version=2.2.13
+version=2.2.14
diff --git 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"

diff --git 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/...pointsminer/miner/api/gql/gql/data/types/CommunityPointsLastViewedContentByTypeAndID.java b/...pointsminer/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/.../src/main/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/data/types/ContentId.java b/.../src/main/java/fr/rakambda/channelpointsminer/miner/api/gql/gql/data/types/ContentId.java
diff --git a/...a/fr/rakambda/channelpointsminer/miner/api/ws/data/message/subtype/LastViewedContent.java b/...a/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/...java/fr/rakambda/channelpointsminer/miner/api/gql/gql/GQLApiChannelPointsContextTest.java b/...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()
@@ -296,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()