From 7ac4731b59c1d924b8c03613dd92340e6c712260 Mon Sep 17 00:00:00 2001
From: oers <stmura+git@gmail.com>
Date: Mon, 18 Nov 2024 13:47:02 +0100
Subject: [PATCH] Android 35

---
 .github/workflows/android.yml          |  6 ++---
 .github/workflows/release.yml          |  2 +-
 project/build.gradle                   | 33 +++++++++++++-------------
 project/src/main/res/values/themes.xml |  3 ++-
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 2707b8a3..fc56b9d2 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -44,7 +44,7 @@ jobs:
         keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
         keyPassword: ${{ secrets.KEY_PASSWORD }}
       env:
-        BUILD_TOOLS_VERSION: "34.0.0"
+        BUILD_TOOLS_VERSION: "35.0.0"
     - name: upload
       uses: actions/upload-artifact@v3
       with:
@@ -56,10 +56,10 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0        
-      - name: set up JDK 17
+      - name: set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'temurin'
           cache: gradle
       - name: Grant execute permission for gradlew
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4f5a9382..707f8136 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -46,7 +46,7 @@ jobs:
         keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
         keyPassword: ${{ secrets.KEY_PASSWORD }}
       env:
-        BUILD_TOOLS_VERSION: "34.0.0"
+        BUILD_TOOLS_VERSION: "35.0.0"
     - name: play store
       uses: r0adkll/upload-google-play@v1
       with:
diff --git a/project/build.gradle b/project/build.gradle
index 8bc96934..b4cb5959 100644
--- a/project/build.gradle
+++ b/project/build.gradle
@@ -8,9 +8,8 @@ project.ext.set("archivesBaseName", "reversatile")
 android {
 
 
-    compileSdk 34
-    buildToolsVersion '34.0.0'
-
+    compileSdk 35
+    buildToolsVersion '35.0.0'
     useLibrary 'android.test.base'
     useLibrary 'android.test.mock'
 
@@ -22,7 +21,7 @@ android {
             abiFilters 'x86', 'x86_64', 'armeabi-v7a', 'arm64-v8a'
         }
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -77,27 +76,27 @@ repositories {
 }
 
 dependencies {
-    api 'com.google.guava:guava:27.1-android'
+    api 'com.google.guava:guava:33.3.1-android'
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.core:core:1.12.0'
-    implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.core:core:1.15.0'
+    implementation 'androidx.vectordrawable:vectordrawable-animated:1.2.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.github.matomo-org:matomo-sdk-android:4.1.4'
-    implementation 'org.apache.commons:commons-lang3:3.0'
+    implementation 'org.apache.commons:commons-lang3:3.17.0'
 
     implementation 'com.github.Innovattic:range-seek-bar:v1.0.6'
-    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
+    implementation(platform('org.jetbrains.kotlin:kotlin-bom:2.0.21'))
 
     // Required -- JUnit 4 framework
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
     // Optional -- Mockito framework
-    testImplementation 'org.mockito:mockito-core:2.28.2'
-    androidTestImplementation 'androidx.test:core:1.5.0'
-    androidTestImplementation 'androidx.test:runner:1.5.2'
-    androidTestImplementation 'androidx.test:rules:1.5.0'
+    testImplementation 'org.mockito:mockito-core:5.14.2'
+    androidTestImplementation 'androidx.test:core:1.6.1'
+    androidTestImplementation 'androidx.test:runner:1.6.2'
+    androidTestImplementation 'androidx.test:rules:1.6.1'
     // Optional -- Hamcrest library
-    androidTestImplementation 'org.hamcrest:hamcrest-library:2.1'
+    androidTestImplementation 'org.hamcrest:hamcrest-library:3.0'
 }
diff --git a/project/src/main/res/values/themes.xml b/project/src/main/res/values/themes.xml
index 08008584..1552f3d7 100644
--- a/project/src/main/res/values/themes.xml
+++ b/project/src/main/res/values/themes.xml
@@ -3,8 +3,9 @@
 
     <!-- the theme applied to the application or activity -->
     <style name="CustomActionBarTheme" parent="Theme.AppCompat">
+        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
         <item name="actionBarStyle">@style/MyActionBar</item>
-        <item name="android:textColor">@color/statustextcolor</item>
+        <item name="android:textColor">@color/statustextcolor</item>test
         <item name="android:actionButtonStyle">@style/ActionButton</item>
     </style>