androidx support and version upto 1.0.4

Aspsine · May 7, 2020 · 505c405 · 505c405
1 parent dc903d4
commit 505c405
Show file tree

Hide file tree

Showing 24 changed files with 226 additions and 41 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    compileSdkVersion 29
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         applicationId "com.aspsine.fragmentnavigator.demo"
-        minSdkVersion 11
-        targetSdkVersion 24
-        versionCode 3
-        versionName "3.0"
+        minSdkVersion 14
+        targetSdkVersion 29
+        versionCode 4
+        versionName "4.0"
     }
     buildTypes {
         release {
@@ -23,10 +23,11 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile project(':library')
-//    compile 'com.github.Aspsine:FragmentNavigator:1.0.2'
-    compile 'com.android.support:appcompat-v7:24.2.0'
-    compile 'com.android.support:design:24.2.0'
-    testCompile 'junit:junit:4.12'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation project(':library')
+    //implementation 'com.github.Aspsine:FragmentNavigator:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'com.google.android.material:material:1.1.0'
+    testImplementation 'junit:junit:4.12'
+    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
 }
diff --git a/app/src/main/java/com/aspsine/fragmentnavigator/demo/broadcast/BroadcastManager.java b/app/src/main/java/com/aspsine/fragmentnavigator/demo/broadcast/BroadcastManager.java
@@ -4,7 +4,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.aspsine.fragmentnavigator.demo.Action;
 

diff --git a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/activity/ExceptionActivity.java b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/activity/ExceptionActivity.java
@@ -1,7 +1,7 @@
 package com.aspsine.fragmentnavigator.demo.ui.activity;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 

diff --git a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/activity/LoginActivity.java b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/activity/LoginActivity.java
@@ -1,7 +1,7 @@
 package com.aspsine.fragmentnavigator.demo.ui.activity;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;

diff --git a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/activity/MainActivity.java b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/activity/MainActivity.java
@@ -4,7 +4,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;

diff --git a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/adapter/ChildFragmentAdapter.java b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/adapter/ChildFragmentAdapter.java
@@ -1,6 +1,6 @@
 package com.aspsine.fragmentnavigator.demo.ui.adapter;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import com.aspsine.fragmentnavigator.FragmentNavigatorAdapter;
 import com.aspsine.fragmentnavigator.demo.ui.fragment.MainFragment;

diff --git a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/adapter/FragmentAdapter.java b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/adapter/FragmentAdapter.java
@@ -1,6 +1,6 @@
 package com.aspsine.fragmentnavigator.demo.ui.adapter;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 import com.aspsine.fragmentnavigator.FragmentNavigatorAdapter;
 import com.aspsine.fragmentnavigator.demo.ui.fragment.ContactsFragment;

diff --git a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/fragment/ContactsFragment.java b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/fragment/ContactsFragment.java
@@ -2,9 +2,9 @@
 
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.util.Log;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/fragment/MainFragment.java b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/fragment/MainFragment.java
@@ -4,8 +4,8 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/widget/BottomNavigatorView.java b/app/src/main/java/com/aspsine/fragmentnavigator/demo/ui/widget/BottomNavigatorView.java
@@ -3,7 +3,7 @@
 import android.content.Context;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-import android.support.v7.widget.LinearLayoutCompat;
+import androidx.appcompat.widget.LinearLayoutCompat;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;

diff --git a/build.gradle b/build.gradle
@@ -3,9 +3,10 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:3.6.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,6 +16,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -15,4 +15,6 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    compileSdkVersion 29
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
-        minSdkVersion 10
-        targetSdkVersion 24
-        versionCode 3
-        versionName "1.0.2"
+        minSdkVersion 14
+        targetSdkVersion 29
+        versionCode 4
+        versionName "1.0.4"
     }
     buildTypes {
         release {
@@ -19,7 +19,7 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:support-fragment:24.2.0'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    testImplementation 'junit:junit:4.12'
+    implementation 'androidx.fragment:fragment:1.2.4'
 }