updated to API 30

JimSeker · Oct 26, 2020 · 303e491 · 303e491
1 parent cee925c
commit 303e491
Show file tree

Hide file tree

Showing 49 changed files with 285 additions and 68 deletions.
diff --git a/BroadCastDemo1/.idea/compiler.xml b/BroadCastDemo1/.idea/compiler.xml
diff --git a/BroadCastDemo1/.idea/gradle.xml b/BroadCastDemo1/.idea/gradle.xml
diff --git a/BroadCastDemo1/.idea/jarRepositories.xml b/BroadCastDemo1/.idea/jarRepositories.xml
diff --git a/BroadCastDemo1/.idea/misc.xml b/BroadCastDemo1/.idea/misc.xml
diff --git a/BroadCastDemo1/app/build.gradle b/BroadCastDemo1/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
 
     defaultConfig {
         applicationId "edu.cs4730.broadcastdemo1"
-        minSdkVersion 22
-        targetSdkVersion 29
+        minSdkVersion 24
+        targetSdkVersion 30
         versionCode="1"
         versionName="1.0"
     }
@@ -21,6 +21,6 @@ android {
 
 dependencies {    
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
 }
diff --git a/BroadCastDemo1/app/src/main/res/values/styles.xml b/BroadCastDemo1/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat">
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight">
         <!-- Customize your theme here. -->
     </style>
 

diff --git a/BroadCastDemo1/build.gradle b/BroadCastDemo1/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
     }
 }
 

diff --git a/BroadCastDemo1/gradle/wrapper/gradle-wrapper.properties b/BroadCastDemo1/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Oct 24 15:53:35 MDT 2019
+#Mon Oct 26 12:54:48 MDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/BroadCastDemo2/.idea/compiler.xml b/BroadCastDemo2/.idea/compiler.xml
diff --git a/BroadCastDemo2/.idea/gradle.xml b/BroadCastDemo2/.idea/gradle.xml
diff --git a/BroadCastDemo2/.idea/jarRepositories.xml b/BroadCastDemo2/.idea/jarRepositories.xml
diff --git a/BroadCastDemo2/.idea/misc.xml b/BroadCastDemo2/.idea/misc.xml
diff --git a/BroadCastDemo2/app/build.gradle b/BroadCastDemo2/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
 
     defaultConfig {
         applicationId "edu.cs4730.broadcastdemo2"
-        minSdkVersion 22
-        targetSdkVersion 29
+        minSdkVersion 24
+        targetSdkVersion 30
         versionCode = "1"
         versionName = "1.0"
     }
@@ -21,6 +21,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
 }
diff --git a/BroadCastDemo2/app/src/main/AndroidManifest.xml b/BroadCastDemo2/app/src/main/AndroidManifest.xml
@@ -2,7 +2,6 @@
 <manifest xmlns:android="https://schemas.android.com/apk/res/android"
     package="edu.cs4730.broadcastdemo2">
 
-   	<uses-permission android:name="android.permission.BATTERY_STATS" />
 
     <application
         android:allowBackup="true"

diff --git a/BroadCastDemo2/app/src/main/java/edu/cs4730/broadcastdemo2/MainFragment.java b/BroadCastDemo2/app/src/main/java/edu/cs4730/broadcastdemo2/MainFragment.java
@@ -83,7 +83,7 @@ public MyReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
 
-            Log.v("myReceiver", "received an intent");
+            Log.wtf("myReceiver", "received an intent");
             String info = "\n something wrong.";
             int mStatus = 0;
             if (intent.getAction().equals(Intent.ACTION_BATTERY_LOW)) {  //battery is low!

diff --git a/BroadCastDemo2/build.gradle b/BroadCastDemo2/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
     }
 }
 

diff --git a/BroadCastDemo2/gradle/wrapper/gradle-wrapper.properties b/BroadCastDemo2/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Oct 24 15:51:25 MDT 2019
+#Mon Oct 26 12:55:19 MDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-6.5-all.zip
diff --git a/BroadcastBoot/.idea/compiler.xml b/BroadcastBoot/.idea/compiler.xml
diff --git a/BroadcastBoot/.idea/gradle.xml b/BroadcastBoot/.idea/gradle.xml
diff --git a/BroadcastBoot/.idea/jarRepositories.xml b/BroadcastBoot/.idea/jarRepositories.xml
diff --git a/BroadcastBoot/.idea/misc.xml b/BroadcastBoot/.idea/misc.xml
diff --git a/BroadcastBoot/app/build.gradle b/BroadcastBoot/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     defaultConfig {
         applicationId "edu.cs4730.broadcastboot"
-        minSdkVersion 19
-        targetSdkVersion 28
+        minSdkVersion 24
+        targetSdkVersion 30
         versionCode="1"
         versionName="1.0"
     }
@@ -21,6 +21,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
 }
diff --git a/BroadcastBoot/app/src/main/java/edu/cs4730/broadcastboot/MainActivity.java b/BroadcastBoot/app/src/main/java/edu/cs4730/broadcastboot/MainActivity.java
@@ -6,7 +6,7 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 
 /**

diff --git a/BroadcastBoot/app/src/main/java/edu/cs4730/broadcastboot/MainFragment.java b/BroadcastBoot/app/src/main/java/edu/cs4730/broadcastboot/MainFragment.java
@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/BroadcastBoot/app/src/main/java/edu/cs4730/broadcastboot/MyReceiver.java b/BroadcastBoot/app/src/main/java/edu/cs4730/broadcastboot/MyReceiver.java
@@ -8,7 +8,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 import android.util.Log;
 
 import java.util.Calendar;