Update android support libraries to v28

NightscoutFoundation · Nov 21, 2023 · 1f1482c · 1f1482c
1 parent 3e86af7
commit 1f1482c
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 17 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -164,6 +164,8 @@ android {
         //exclude 'META-INF/androidx.core_core.version'
         exclude 'META-INF/com.android.tools/proguard/coroutines.pro'
         exclude 'META-INF/ASL2.0'
+        exclude 'META-INF/androidx.interpolator_interpolator.version'
+        exclude 'META-INF/androidx.core_core.version'
     }
 
     compileOptions {
@@ -268,12 +270,12 @@ dependencies {
     //implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.22'
 
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support:design:26.1.0'
-    implementation 'com.android.support:support-v13:26.1.0'
-    implementation 'com.android.support:recyclerview-v7:26.1.0'
-    implementation 'com.android.support:cardview-v7:26.1.0'
-    implementation 'com.android.support:preference-v7:26.1.0'
+    implementation ('com.android.support:appcompat-v7:28.0.0')
+    implementation ('com.android.support:design:28.0.0')
+    implementation ('com.android.support:support-v13:28.0.0')
+    implementation ('com.android.support:recyclerview-v7:28.0.0')
+    implementation ('com.android.support:cardview-v7:28.0.0')
+    implementation ('com.android.support:preference-v7:28.0.0')
 
     implementation ('com.google.apis:google-api-services-drive:v3-rev20220815-2.0.0') {
         exclude group: 'org.apache.httpcomponents'
@@ -366,7 +368,7 @@ dependencies {
     androidTestImplementation 'com.android.support.test:runner:1.0.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    androidTestImplementation 'com.android.support.test.espresso:espresso-idling-resource:3.0.1'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-idling-resource:3.0.2'
     // add this for intent mocking support
     //androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.1'
     // add this for webview testing support

diff --git a/app/libs/core-1.1.0.aar b/app/libs/core-1.1.0.aar
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -95,6 +95,8 @@
         android:largeHeap="true"
         android:maxAspectRatio="2.1"
         android:theme="@style/AppTheme"
+        tools:replace="android:appComponentFactory"
+        android:appComponentFactory="android.support.v4.app.CoreComponentFactory"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".HealthPrivacy"

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/services/ActivityRecognizedService.java b/app/src/main/java/com/eveningoutpost/dexdrip/services/ActivityRecognizedService.java
@@ -11,8 +11,8 @@
 import android.os.PowerManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.NotificationManagerCompat;
-import android.support.v7.app.NotificationCompat;
 import android.util.Log;
 import android.util.SparseArray;
 

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NotificationChannels.java b/app/src/main/java/com/eveningoutpost/dexdrip/utilitymodels/NotificationChannels.java
@@ -176,10 +176,10 @@ public static NotificationChannel getChan(NotificationCompat.Builder wip) {
 
         // mirror the notification parameters in the channel
         template.setGroup(temp.getChannelId());
-        template.setVibrationPattern(wip.mNotification.vibrate);
-        template.setSound(wip.mNotification.sound, generic_audio);
-        template.setLightColor(wip.mNotification.ledARGB);
-        if ((wip.mNotification.ledOnMS != 0) && (wip.mNotification.ledOffMS != 0))
+        template.setVibrationPattern(wip.getNotification().vibrate);
+        template.setSound(wip.getNotification().sound, generic_audio);
+        template.setLightColor(wip.getNotification().ledARGB);
+        if ((wip.getNotification().ledOnMS != 0) && (wip.getNotification().ledOffMS != 0))
             template.enableLights(true); // weird how this doesn't work like vibration pattern
         template.setDescription(temp.getChannelId() + " " + wip.hashCode());
 
@@ -201,8 +201,8 @@ public static NotificationChannel getChan(NotificationCompat.Builder wip) {
         }
         channel.setDescription(template.getDescription());
         channel.setVibrationPattern(template.getVibrationPattern());
-        template.setLightColor(wip.mNotification.ledARGB);
-        if ((wip.mNotification.ledOnMS != 0) && (wip.mNotification.ledOffMS != 0))
+        template.setLightColor(wip.getNotification().ledARGB);
+        if ((wip.getNotification().ledOnMS != 0) && (wip.getNotification().ledOffMS != 0))
             template.enableLights(true); // weird how this doesn't work like vibration pattern
         template.setDescription(temp.getChannelId() + " " + wip.hashCode());
 

diff --git a/libkeks/build.gradle b/libkeks/build.gradle
@@ -35,7 +35,7 @@ android {
 
 dependencies {
     compileOnly files('lib/xdrip-plugin-interface.jar')
-    implementation 'com.android.support:support-v13:26.1.0'
+    implementation 'com.android.support:support-v13:28.0.0'
 
     implementation 'org.bouncycastle:bcpkix-jdk15to18:1.68'
     implementation 'org.bouncycastle:bcprov-jdk15to18:1.68'

diff --git a/localeapi/build.gradle b/localeapi/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.android.library'
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
         minSdkVersion 21

diff --git a/wear/build.gradle b/wear/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 apply from: '../common.gradle'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
     lintOptions {
         checkReleaseBuilds false
 //        abortOnError false