Feat(Build): move to AGP 8.1.1

glpi-project · Dec 4, 2024 · 4bd420d · 4bd420d
1 parent fa7210e
commit 4bd420d
Show file tree

Hide file tree

Showing 30 changed files with 118 additions and 105 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:8.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0"
         classpath 'com.google.gms:google-services:4.4.2'
     }

diff --git a/example_java/build.gradle b/example_java/build.gradle
@@ -21,11 +21,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
-    lintOptions {
-        checkReleaseBuilds false
+    lint {
         abortOnError false
+        checkReleaseBuilds false
     }
+
 }
 
 dependencies {

diff --git a/example_java/src/androidTest/java/org/flyve/example_java/ExampleInstrumentedTest.java b/example_java/src/androidTest/java/org/flyve/example_java/ExampleInstrumentedTest.java
@@ -28,8 +28,8 @@
 
 import android.content.Context;
 
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -41,12 +41,12 @@
  *
  * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
  */
-@RunWith(AndroidJUnit4.class)
+@RunWith(AndroidJUnit4ClassRunner.class)
 public class ExampleInstrumentedTest {
     @Test
     public void useAppContext() throws Exception {
         // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
         assertEquals("org.flyve.example_java", appContext.getPackageName());
     }

diff --git a/example_kotlin/build.gradle b/example_kotlin/build.gradle
@@ -22,10 +22,18 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
-    lintOptions {
-        checkReleaseBuilds false
+    lint {
         abortOnError false
+        checkReleaseBuilds false
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17
     }
 
 }

diff --git a/example_kotlin/src/androidTest/java/org/flyve/example_kotlin/ExampleInstrumentedTest.kt b/example_kotlin/src/androidTest/java/org/flyve/example_kotlin/ExampleInstrumentedTest.kt
@@ -25,9 +25,8 @@
  */
 
 package org.flyve.example_kotlin
-import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.runner.AndroidJUnit4
-import org.junit.Assert.*
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -36,7 +35,7 @@ import org.junit.runner.RunWith
  *
  * See [testing documentation](http://d.android.com/tools/testing).
  */
-@RunWith(AndroidJUnit4::class)
+@RunWith(AndroidJUnit4ClassRunner::class)
 class ExampleInstrumentedTest {
     @Test
     fun useAppContext() {

diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,6 @@
 org.gradle.jvmargs=-Xmx4608m
 android.useAndroidX=true
 android.enableJetifier=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Dec 02 16:44:40 CET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/inventory/build.gradle b/inventory/build.gradle
@@ -17,13 +17,15 @@ android {
         }
         debug {
             minifyEnabled false
-            testCoverageEnabled true
+            enableUnitTestCoverage true
+            enableAndroidTestCoverage true
         }
     }
 
     buildFeatures {
         viewBinding true
     }
+    namespace 'org.flyve.inventory'
 }
 
 configurations {
@@ -37,8 +39,7 @@ dependencies {
     androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'androidx.test:runner:1.3.0'
+    testImplementation 'androidx.test:runner:1.6.2' // Or latest version
     testImplementation 'androidx.test:core:1.3.0'
 
     implementation 'com.orhanobut:logger:2.2.0'

diff --git a/inventory/src/androidTest/java/org/flyve/inventory/BatteryTest.java b/inventory/src/androidTest/java/org/flyve/inventory/BatteryTest.java
@@ -28,19 +28,19 @@
 
 import android.content.Context;
 
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
 
 import org.flyve.inventory.categories.Battery;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import static org.junit.Assert.assertNotEquals;
 
-@RunWith(AndroidJUnit4.class)
+@RunWith(AndroidJUnit4ClassRunner.class)  
 public class BatteryTest {
 
-    Context appContext = InstrumentationRegistry.getTargetContext();
+    Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
     @Test
     public void getTechnology() {

diff --git a/inventory/src/androidTest/java/org/flyve/inventory/BiosTest.java b/inventory/src/androidTest/java/org/flyve/inventory/BiosTest.java
@@ -29,18 +29,18 @@
 import android.content.Context;
 
 
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
 
 import org.flyve.inventory.categories.Bios;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import static org.junit.Assert.*;
 
-@RunWith(AndroidJUnit4.class)
+@RunWith(AndroidJUnit4ClassRunner.class)  
 public class BiosTest {
-    private Context appContext = InstrumentationRegistry.getTargetContext();
+    private Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();;
 
     @Test
     public void getAssesTag() {

diff --git a/inventory/src/androidTest/java/org/flyve/inventory/BluetoothTest.java b/inventory/src/androidTest/java/org/flyve/inventory/BluetoothTest.java
@@ -27,8 +27,8 @@
 package org.flyve.inventory;
 
 import android.content.Context;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
 
 import org.flyve.inventory.categories.Bluetooth;
 
@@ -38,10 +38,10 @@
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 
-@RunWith(AndroidJUnit4.class)
+@RunWith(AndroidJUnit4ClassRunner.class)  
 public class BluetoothTest {
 
-    Context appContext = InstrumentationRegistry.getTargetContext();
+    Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
     @Test
     public void getHardware_address() throws Exception {

diff --git a/inventory/src/androidTest/java/org/flyve/inventory/CamerasTest.java b/inventory/src/androidTest/java/org/flyve/inventory/CamerasTest.java
@@ -29,8 +29,8 @@
 import android.content.Context;
 import android.hardware.Camera;
 import android.hardware.camera2.CameraCharacteristics;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
 
 import org.flyve.inventory.categories.Cameras;
 import org.junit.Test;
@@ -40,10 +40,10 @@
 
 import static org.junit.Assert.assertNotEquals;
 
-@RunWith(AndroidJUnit4.class)
+@RunWith(AndroidJUnit4ClassRunner.class)  
 public class CamerasTest {
 
-    Context appContext = InstrumentationRegistry.getTargetContext();
+    Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
     @Test
     public void getResolutions() {

diff --git a/inventory/src/androidTest/java/org/flyve/inventory/ControllersTest.java b/inventory/src/androidTest/java/org/flyve/inventory/ControllersTest.java
@@ -27,8 +27,9 @@
 package org.flyve.inventory;
 
 import android.content.Context;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
 
 import org.flyve.inventory.categories.Controllers;
 import org.junit.Test;
@@ -38,10 +39,10 @@
 
 import static org.junit.Assert.assertNotEquals;
 
-@RunWith(AndroidJUnit4.class)
+@RunWith(AndroidJUnit4ClassRunner.class)  
 public class ControllersTest {
 
-    Context appContext = InstrumentationRegistry.getTargetContext();
+    Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
     @Test
     public void getDriver() {

diff --git a/inventory/src/androidTest/java/org/flyve/inventory/CpusTest.java b/inventory/src/androidTest/java/org/flyve/inventory/CpusTest.java
@@ -27,8 +27,8 @@
 package org.flyve.inventory;
 
 import android.content.Context;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
 
 import org.flyve.inventory.categories.Cpus;
 
@@ -38,10 +38,10 @@
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 
-@RunWith(AndroidJUnit4.class)
+@RunWith(AndroidJUnit4ClassRunner.class)  
 public class CpusTest {
 
-    Context appContext = InstrumentationRegistry.getTargetContext();
+    Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
     @Test
     public void getArch() throws Exception {

diff --git a/inventory/src/androidTest/java/org/flyve/inventory/CreateFileTest.java b/inventory/src/androidTest/java/org/flyve/inventory/CreateFileTest.java
@@ -27,8 +27,8 @@
 package org.flyve.inventory;
 
 import android.content.Context;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
 
 import org.flyve.inventory.categories.Categories;
 import org.flyve.inventory.categories.Category;
@@ -42,10 +42,10 @@
 
 import static org.junit.Assert.assertTrue;
 
-@RunWith(AndroidJUnit4.class)
+@RunWith(AndroidJUnit4ClassRunner.class)  
 public class CreateFileTest {
 
-    Context appContext = InstrumentationRegistry.getTargetContext();
+    Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
     @Test
     public void createXMLTest() throws Exception {

diff --git a/inventory/src/androidTest/java/org/flyve/inventory/DrivesTest.java b/inventory/src/androidTest/java/org/flyve/inventory/DrivesTest.java
@@ -28,7 +28,6 @@
 
 import android.content.Context;
 import android.os.Environment;
-import androidx.test.InstrumentationRegistry;
 
 import org.flyve.inventory.categories.Drives;
 
@@ -38,9 +37,11 @@
 
 import static org.junit.Assert.assertNotEquals;
 
-    public class DrivesTest {
+import androidx.test.platform.app.InstrumentationRegistry;
 
-    Context appContext = InstrumentationRegistry.getTargetContext();
+public class DrivesTest {
+
+    Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
     File froot = Environment.getRootDirectory();
     File fexternal = Environment.getExternalStorageDirectory();

diff --git a/inventory/src/androidTest/java/org/flyve/inventory/HardwareTest.java b/inventory/src/androidTest/java/org/flyve/inventory/HardwareTest.java
@@ -27,8 +27,9 @@
 package org.flyve.inventory;
 
 import android.content.Context;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
 
 import org.flyve.inventory.categories.Hardware;
 
@@ -37,10 +38,10 @@
 
 import static org.junit.Assert.assertNotEquals;
 
-@RunWith(AndroidJUnit4.class)
+@RunWith(AndroidJUnit4ClassRunner.class)  
 public class HardwareTest {
 
-    Context appContext = InstrumentationRegistry.getTargetContext();
+    Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
     @Test
     public void getDatelastloggeduser() throws Exception {

diff --git a/inventory/src/androidTest/java/org/flyve/inventory/InputsTest.java b/inventory/src/androidTest/java/org/flyve/inventory/InputsTest.java
@@ -27,8 +27,9 @@
 package org.flyve.inventory;
 
 import android.content.Context;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
 import org.flyve.inventory.categories.Inputs;
 
 import org.junit.Test;
@@ -37,10 +38,10 @@
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 
-@RunWith(AndroidJUnit4.class)
+@RunWith(AndroidJUnit4ClassRunner.class)
 public class InputsTest {
 
-    Context appContext = InstrumentationRegistry.getTargetContext();
+    Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
     @Test
     public void getKeyboard() throws Exception {

diff --git a/inventory/src/androidTest/java/org/flyve/inventory/InventoryTaskTest.java b/inventory/src/androidTest/java/org/flyve/inventory/InventoryTaskTest.java
@@ -27,8 +27,8 @@
 package org.flyve.inventory;
 
 import android.content.Context;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
 import android.util.Log;
 
 import org.junit.Test;
@@ -37,9 +37,9 @@
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 
-@RunWith(AndroidJUnit4.class)
+@RunWith(AndroidJUnit4ClassRunner.class)  
 public class InventoryTaskTest {
-    Context appContext = InstrumentationRegistry.getTargetContext();
+    Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
     @Test
     public void getJSONTest() throws Exception {