Fix(core): clean / bump dependencies

glpi-project · Dec 3, 2024 · e3a8896 · e3a8896
1 parent 9623c64
commit e3a8896
Show file tree

Hide file tree

Showing 21 changed files with 576 additions and 467 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -59,16 +59,28 @@ jobs:
       run: gcloud config set project ${{ secrets.FIREBASE_PROJECT_ID }}
 
     # Run Instrumentation Tests in Firebase Test Lab
+    # dm3q    Samasung galaxy s23     SDK 33
+    # e1q     Samasung galaxy s24     SDK 34
+    # bluejay Google Pixel 6a         SDK 32
+    # a51     Samsung  Galaxy A51     SDK 31
+    # q2q     Samsung Galaxy Z Fold3  SDK 30
+    # cactus  Xiaomi Redmi 6A         SDK 27
     - name: Run Instrumentation Tests in Firebase Test Lab
-      run: gcloud firebase test android run --type instrumentation --app ${{ env.module_java }}/build/outputs/apk/debug/example_java-debug.apk --test ${{ env.module_java }}/build/outputs/apk/androidTest/debug/example_java-debug-androidTest.apk --device model=Nexus6,version=25,locale=en,orientation=portrait
-
+      run: |
+        gcloud firebase test android run --type instrumentation --app ${{ env.module_java }}/build/outputs/apk/debug/example_java-debug.apk --test ${{ env.module_java }}/build/outputs/apk/androidTest/debug/example_java-debug-androidTest.apk --device model=Nexus6,version=25,locale=en,orientation=portrait
+        gcloud firebase test android run --type instrumentation --app ${{ env.module_java }}/build/outputs/apk/debug/example_java-debug.apk --test ${{ env.module_java }}/build/outputs/apk/androidTest/debug/example_java-debug-androidTest.apk --device model=e1q,version=34,locale=en,orientation=portrait
+        gcloud firebase test android run --type instrumentation --app ${{ env.module_java }}/build/outputs/apk/debug/example_java-debug.apk --test ${{ env.module_java }}/build/outputs/apk/androidTest/debug/example_java-debug-androidTest.apk --device model=dm3q,version=33,locale=en,orientation=portrait
+        gcloud firebase test android run --type instrumentation --app ${{ env.module_java }}/build/outputs/apk/debug/example_java-debug.apk --test ${{ env.module_java }}/build/outputs/apk/androidTest/debug/example_java-debug-androidTest.apk --device model=bluejay,version=32,locale=en,orientation=portrait
+        gcloud firebase test android run --type instrumentation --app ${{ env.module_java }}/build/outputs/apk/debug/example_java-debug.apk --test ${{ env.module_java }}/build/outputs/apk/androidTest/debug/example_java-debug-androidTest.apk --device model=a51,version=31,locale=en,orientation=portrait
+        gcloud firebase test android run --type instrumentation --app ${{ env.module_java }}/build/outputs/apk/debug/example_java-debug.apk --test ${{ env.module_java }}/build/outputs/apk/androidTest/debug/example_java-debug-androidTest.apk --device model=q2q,version=30,locale=en,orientation=portrait
+        gcloud firebase test android run --type instrumentation --app ${{ env.module_java }}/build/outputs/apk/debug/example_java-debug.apk --test ${{ env.module_java }}/build/outputs/apk/androidTest/debug/example_java-debug-androidTest.apk --device model=cactus,version=27,locale=en,orientation=portrait
 
     ##########################################
     # Upload Artifacts (APK / AAR / JAR)     #
     ##########################################
     # Upload APK for Java version
     - name: Upload APK Debug for Java
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Java-Debug-APK
         path: ${{ env.module_java }}/build/outputs/apk/debug/${{ env.module_java }}-debug.apk

diff --git a/build.gradle b/build.gradle
@@ -5,29 +5,27 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.4'
+        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
+        classpath 'com.google.gms:google-services:4.4.2'
     }
 }
 
 allprojects {
     repositories {
         google()
         mavenCentral()
-        jcenter()
     }
-    tasks.withType(JavaCompile) {
-        options.compilerArgs << "-Xlint:deprecation"
+    tasks.withType(JavaCompile).tap {
+        configureEach {
+            options.compilerArgs << "-Xlint:deprecation"
+        }
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
diff --git a/composer.json b/composer.json
@@ -1,5 +1,5 @@
 {
     "require": {
-        "consolidation/robo": "^3"
+        "consolidation/robo": "^4"
     }
 }