⬆️ Various: upgrade all dependencies to latest

EIDU · Mar 4, 2024 · 0e7a071 · 0e7a071
1 parent 5e4bcfb
commit 0e7a071
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 36 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -38,9 +38,9 @@ jobs:
         env:
           MAVEN_CENTRAL_USERNAME: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
           MAVEN_CENTRAL_PASSWORD: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
-          SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
-          SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
-          SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+          SIGNING_KEY_ID: ${{ secrets.MAVEN_CENTRAL_KEY_ID }}
+          SIGNING_KEY: ${{ secrets.MAVEN_CENTRAL_KEY }}
+          SIGNING_PASSWORD: ${{ secrets.MAVEN_CENTRAL_KEY_PASSWORD }}
 
       - name: Determine version
         run: echo "VERSION_NAME=`./gradlew -q printVersion | tail -n 1`" >> $GITHUB_ENV

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,7 +1,7 @@
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
 
 plugins {
-    id("com.github.ben-manes.versions") version "0.33.0"
+    id("com.github.ben-manes.versions") version "0.42.0"
 }
 
 buildscript {
@@ -10,8 +10,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.3.1")
-        classpath("de.mannodermaus.gradle.plugins:android-junit5:1.8.2.1")
+        classpath("com.android.tools.build:gradle:8.2.2")
+        classpath("de.mannodermaus.gradle.plugins:android-junit5:1.10.0.0")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Nov 28 17:32:45 CET 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/integration-library/build.gradle.kts b/integration-library/build.gradle.kts
@@ -1,20 +1,20 @@
 plugins {
     id("com.android.library")
     id("maven-publish")
-    id("com.diffplug.spotless") version "5.14.2"
+    id("com.diffplug.spotless") version "6.25.0"
     id("de.mannodermaus.android-junit5")
     id("signing")
-    id("com.palantir.git-version") version "0.12.2"
+    id("com.palantir.git-version") version "3.0.0"
 }
 
 val gitVersion: groovy.lang.Closure<String> by extra
 
 android {
-    compileSdk = 33
+    namespace = "com.eidu.integration"
+    compileSdk = 34
 
     defaultConfig {
         minSdk = 21
-        targetSdk = 33
         version = gitVersion()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -34,36 +34,34 @@ android {
         targetCompatibility = JavaVersion.VERSION_1_8
     }
 
-    lintOptions {
-        enable(
-            "MissingPermission",
-            "SuspiciousImport",
-            "UsesMinSdkAttributes",
-            "Proguard"
-        )
-        isCheckTestSources = true
-        isCheckAllWarnings = true
-        isWarningsAsErrors = true
+    lint {
+        enable += "MissingPermission"
+        enable += "SuspiciousImport"
+        enable += "UsesMinSdkAttributes"
+        enable += "Proguard"
+        checkTestSources = true
+        checkAllWarnings = true
+        warningsAsErrors = true
     }
 
     useLibrary("android.test.mock")
 }
 
 dependencies {
-    implementation("androidx.annotation:annotation:1.5.0")
+    implementation("androidx.annotation:annotation:1.7.1")
 
-    androidTestImplementation("androidx.test:runner:1.5.1")
-    androidTestImplementation("org.junit.jupiter:junit-jupiter-api:5.9.0")
-    androidTestImplementation("de.mannodermaus.junit5:android-test-core:1.3.0")
-    androidTestImplementation("org.junit.jupiter:junit-jupiter-params:5.9.0")
-    androidTestRuntimeOnly("de.mannodermaus.junit5:android-test-runner:1.3.0")
+    androidTestImplementation("androidx.test:runner:1.5.2")
+    androidTestImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
+    androidTestImplementation("de.mannodermaus.junit5:android-test-core:1.4.0")
+    androidTestImplementation("org.junit.jupiter:junit-jupiter-params:5.10.2")
+    androidTestRuntimeOnly("de.mannodermaus.junit5:android-test-runner:1.4.0")
 
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.0")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.0")
-    testImplementation("org.junit.jupiter:junit-jupiter-params:5.9.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
+    testImplementation("org.junit.jupiter:junit-jupiter-params:5.10.2")
 
     testImplementation("androidx.test:core:1.5.0")
-    testImplementation("org.mockito:mockito-core:4.0.0")
+    testImplementation("org.mockito:mockito-core:5.11.0")
 }
 
 tasks.withType<Test> {

diff --git a/integration-library/src/main/java/com/eidu/integration/RunLearningUnitResult.java b/integration-library/src/main/java/com/eidu/integration/RunLearningUnitResult.java
@@ -353,15 +353,25 @@ public int hashCode() {
 
     /** An enum describing the reason why a learning unit run has ended. */
     public enum ResultType {
-        /** @see RunLearningUnitResult#ofSuccess */
+        /**
+         * @see RunLearningUnitResult#ofSuccess
+         */
         Success,
-        /** @see RunLearningUnitResult#ofAbort */
+        /**
+         * @see RunLearningUnitResult#ofAbort
+         */
         Abort,
-        /** @see RunLearningUnitResult#ofError */
+        /**
+         * @see RunLearningUnitResult#ofError
+         */
         Error,
-        /** @see RunLearningUnitResult#ofTimeoutInactivity */
+        /**
+         * @see RunLearningUnitResult#ofTimeoutInactivity
+         */
         TimeoutInactivity,
-        /** @see RunLearningUnitResult#ofTimeUp */
+        /**
+         * @see RunLearningUnitResult#ofTimeUp
+         */
         TimeUp;
 
         @Nullable