chore(J21 compat): upgrade everything android

Signed-off-by: l-1squared <30831153+l-1squared@users.noreply.github.com>
TNG · Oct 25, 2024 · 4cb1490 · 4cb1490
1 parent 003b0be
commit 4cb1490
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 19 deletions.
diff --git a/build.gradle b/build.gradle
@@ -66,7 +66,7 @@ nexusStaging {
 
 subprojects {
     ext {
-        androidCompileSdkVersion = 33
+        androidCompileSdkVersion = 34
         androidMinSdkVersion = 29
         androidTargetSdkVersion = 32
 

diff --git a/example-projects/android/build.gradle b/example-projects/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.5.2'
     }
 }
 
@@ -19,7 +19,8 @@ repositories {
 }
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
+    namespace 'jgiven.tngtech.com.jgiven_android.example'
     defaultConfig {
         applicationId "com.tngtech.jgiven.android.example"
         minSdkVersion 29
@@ -46,8 +47,9 @@ configurations {
 }
 
 dependencies {
-    implementation('androidx.appcompat:appcompat:1.6.1') {
+    implementation('androidx.appcompat:appcompat:1.7.0') {
         exclude group: 'com.google.guava', module: 'listenablefuture'
+        exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
     }
 
     androidTestImplementation('androidx.test.espresso:espresso-core:3.6.1', {

diff --git a/example-projects/android/src/main/AndroidManifest.xml b/example-projects/android/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.tngtech.jgiven.android.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,8 +7,8 @@ spring-version = "5.3.39"
 androidx-test-version = "1.6.1"
 
 [libraries]
-androidGradlePlugin = { module = "com.android.tools.build:gradle", version = "7.4.2"}
-androidx-appcompat = {module = "androidx.appcompat:appcompat", version = "1.6.1"}
+androidGradlePlugin = { module = "com.android.tools.build:gradle", version = "8.5.2"}
+androidx-appcompat = {module = "androidx.appcompat:appcompat", version = "1.7.0"}
 androidx-test-core = {module = "androidx.test:core", version.ref = "androidx-test-version"}
 androidx-test-rules = {module = "androidx.test:rules", version.ref = "androidx-test-version"}
 androidx-test-junit = {module = "androidx.test.ext:junit", version = "1.2.1"}

diff --git a/jgiven-android-test/build.gradle b/jgiven-android-test/build.gradle
@@ -17,7 +17,8 @@ repositories {
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion androidCompileSdkVersion
+    compileSdk androidCompileSdkVersion
+    namespace 'jgiven.tngtech.com.jgiven_android.example'
     defaultConfig {
         applicationId "com.tngtech.jgiven.android.example"
         minSdkVersion androidMinSdkVersion
@@ -47,8 +48,8 @@ configurations {
 dependencies {
     implementation(libs.androidx.appcompat) {
         exclude group: 'com.google.guava', module: 'listenablefuture'
+        exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
     }
-
     androidTestImplementation('androidx.test.espresso:espresso-core:3.6.1', {
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.google.guava', module: 'listenablefuture'
@@ -65,7 +66,7 @@ dependencies {
 }
 
 def targetDir = 'build/reports/jgiven/json'
-def adb = android.getAdbExe().toString()
+def adb = android.adbExecutable.toString()
 def reportsDir = '/storage/emulated/0/Download/jgiven-reports'
 
 task cleanJGivenReports(type: Delete) {

diff --git a/jgiven-android-test/src/debug/AndroidManifest.xml b/jgiven-android-test/src/debug/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.tngtech.jgiven.android.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 

diff --git a/jgiven-android-test/src/main/AndroidManifest.xml b/jgiven-android-test/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.tngtech.jgiven.android.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"

diff --git a/jgiven-android-test/src/main/java/com/tngtech/jgiven/android/example/MainActivity.java b/jgiven-android-test/src/main/java/com/tngtech/jgiven/android/example/MainActivity.java
@@ -5,6 +5,7 @@
 import android.widget.Button;
 import android.widget.TextView;
 import androidx.appcompat.app.AppCompatActivity;
+import jgiven.tngtech.com.jgiven_android.example.R;
 
 public class MainActivity extends AppCompatActivity {
 

diff --git a/settings.gradle b/settings.gradle
@@ -67,13 +67,13 @@ def release = System.env.RELEASE == "true"
 def android = System.env.ANDROID == "true"
 boolean hasAndroidSourcePath = (System.env.ANDROID_SDK_ROOT)
 
-if ((android || release) && hasAndroidSourcePath) {
+//if ((android || release) && hasAndroidSourcePath) {
     include ':jgiven-android'
-}
+//}
 
-if (android && !release && hasAndroidSourcePath) {
+//if (android && !release && hasAndroidSourcePath) {
     include ':jgiven-android-test'
-}
+//}
 
 if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_19)) {
     include ':jgiven-future-java-tests'