moved to androidx, updated to API 29 and gradle updates

JimSeker · Oct 24, 2019 · 8d6c07f · 8d6c07f
1 parent bb163a4
commit 8d6c07f
Show file tree

Hide file tree

Showing 26 changed files with 381 additions and 108 deletions.
diff --git a/BroadCastDemo1/.idea/codeStyles/Project.xml b/BroadCastDemo1/.idea/codeStyles/Project.xml
diff --git a/BroadCastDemo1/.idea/gradle.xml b/BroadCastDemo1/.idea/gradle.xml
diff --git a/BroadCastDemo1/app/build.gradle b/BroadCastDemo1/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
- compileSdkVersion 28
+ compileSdkVersion 29
 
  defaultConfig {
  applicationId "edu.cs4730.broadcastdemo1"
- minSdkVersion 19
- targetSdkVersion 28
+ minSdkVersion 22
+ targetSdkVersion 29
  versionCode="1"
  versionName="1.0"
  }
@@ -21,5 +21,5 @@ android {
 
 dependencies { 
  implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation 'com.android.support:appcompat-v7:28.0.0'
+ implementation 'androidx.appcompat:appcompat:1.1.0'
 }
diff --git a/BroadCastDemo1/app/src/main/java/edu/cs4730/broadcastdemo1/MainActivity.java b/BroadCastDemo1/app/src/main/java/edu/cs4730/broadcastdemo1/MainActivity.java
@@ -2,8 +2,8 @@
 
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 
 /**

diff --git a/BroadCastDemo1/app/src/main/java/edu/cs4730/broadcastdemo1/MainFragment.java b/BroadCastDemo1/app/src/main/java/edu/cs4730/broadcastdemo1/MainFragment.java
@@ -1,9 +1,9 @@
 package edu.cs4730.broadcastdemo1;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.content.Intent;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/BroadCastDemo1/build.gradle b/BroadCastDemo1/build.gradle
@@ -5,7 +5,7 @@ buildscript {
  google()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:3.2.1'
+ classpath 'com.android.tools.build:gradle:3.5.1'
  }
 }
 
@@ -15,5 +15,6 @@ allprojects {
  maven {
  url "https://maven.google.com"
  }
+ google()
  }
 }
diff --git a/BroadCastDemo1/gradle.properties b/BroadCastDemo1/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/BroadCastDemo1/gradle/wrapper/gradle-wrapper.properties b/BroadCastDemo1/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Oct 23 08:02:30 MDT 2018
+#Thu Oct 24 15:53:35 MDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/BroadCastDemo2/.idea/codeStyles/Project.xml b/BroadCastDemo2/.idea/codeStyles/Project.xml
diff --git a/BroadCastDemo2/.idea/gradle.xml b/BroadCastDemo2/.idea/gradle.xml