update version(grade, kotlin, support library etc.)

aesean · Feb 12, 2019 · 2ea9b40 · 2ea9b40
1 parent 9547be7
commit 2ea9b40
Show file tree

Hide file tree

Showing 23 changed files with 75 additions and 126 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/ApacheV2.xml b/.idea/copyright/ApacheV2.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,37 +15,36 @@
  */
 
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 
 android {
- compileSdkVersion 26
+ compileSdkVersion 28
  defaultConfig {
  applicationId "com.aesean.activitystack"
  minSdkVersion 16
- targetSdkVersion 26
+ targetSdkVersion 28
  versionCode 1
  versionName "1.0"
- testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+ testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
  }
  buildTypes {
  release {
  minifyEnabled true
- proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
  }
  }
 }
 
 dependencies {
  implementation fileTree(include: ['*.jar'], dir: 'libs')
- androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
- exclude group: 'com.android.support', module: 'support-annotations'
- })
- implementation 'com.android.support:appcompat-v7:26.1.0'
- implementation 'com.android.support:design:26.1.0'
- implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+ androidTestImplementation 'androidx.test:runner:1.1.1'
+ androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+ androidTestImplementation 'androidx.test:rules:1.1.1'
+ implementation 'androidx.appcompat:appcompat:1.0.2'
+ implementation 'androidx.cardview:cardview:1.0.0'
+ implementation 'com.google.android.material:material:1.0.0'
+ implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
  testImplementation 'junit:junit:4.12'
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
- implementation 'com.android.support:cardview-v7:26.1.0'
+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
-
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
diff --git a/app/src/androidTest/java/com/aesean/activitystack/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/aesean/activitystack/ExampleInstrumentedTest.java
@@ -17,8 +17,8 @@
 package com.aesean.activitystack;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/app/src/main/java/com/aesean/activitystack/LaunchActivityService.java b/app/src/main/java/com/aesean/activitystack/LaunchActivityService.java
@@ -20,7 +20,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * LaunchActivityService

diff --git a/app/src/main/java/com/aesean/activitystack/MainActivity.java b/app/src/main/java/com/aesean/activitystack/MainActivity.java
@@ -22,7 +22,7 @@
 import android.os.Bundle;
 import android.os.Debug;
 import android.os.Process;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;

diff --git a/app/src/main/java/com/aesean/activitystack/SecondActivity.java b/app/src/main/java/com/aesean/activitystack/SecondActivity.java
@@ -18,7 +18,7 @@
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import com.aesean.activitystack.utils.ApplicationUtils;

diff --git a/app/src/main/java/com/aesean/activitystack/ShowMoreAnimationActivityActivity.kt b/app/src/main/java/com/aesean/activitystack/ShowMoreAnimationActivityActivity.kt
@@ -18,7 +18,7 @@ package com.aesean.activitystack
 
 import android.animation.ValueAnimator
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.view.View
 import android.widget.TextView
 import com.aesean.activitystack.extensions.setMaxLinesWithAnimation

diff --git a/app/src/main/java/com/aesean/activitystack/utils/LifecycleUtils.java b/app/src/main/java/com/aesean/activitystack/utils/LifecycleUtils.java
@@ -20,9 +20,9 @@
 import android.app.Application;
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
 import android.util.Log;
 
 import java.lang.ref.WeakReference;

diff --git a/app/src/main/java/com/aesean/activitystack/utils/TextViewUtils.java b/app/src/main/java/com/aesean/activitystack/utils/TextViewUtils.java
@@ -22,9 +22,9 @@
 import android.annotation.SuppressLint;
 import android.graphics.RectF;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import android.text.Layout;
 import android.text.StaticLayout;
 import android.text.TextDirectionHeuristic;
@@ -40,7 +40,7 @@
 
 /**
  * TextViewUtils.
- * {@link android.support.v7.widget.AppCompatTextViewAutoSizeHelper}
+ * {@link androidx.appcompat.widget.AppCompatTextViewAutoSizeHelper}
  *
  * @author danny
  * @version 1.0

diff --git a/app/src/main/java/com/aesean/activitystack/utils/ThreadMonitor.java b/app/src/main/java/com/aesean/activitystack/utils/ThreadMonitor.java
@@ -21,7 +21,7 @@
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Printer;

diff --git a/app/src/main/java/com/aesean/activitystack/utils/shake/ShakeManager.java b/app/src/main/java/com/aesean/activitystack/utils/shake/ShakeManager.java
@@ -22,8 +22,8 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.hardware.SensorManager;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
 
 import com.aesean.activitystack.BuildConfig;
 import com.aesean.activitystack.utils.ApplicationUtils;

diff --git a/app/src/main/res/layout/activity_show_more_animation_activity.xml b/app/src/main/res/layout/activity_show_more_animation_activity.xml
@@ -29,7 +29,7 @@
  android:layout_height="wrap_content"
  android:text="@string/show_more_tips" />
 
- <android.support.v7.widget.CardView
+ <androidx.cardview.widget.CardView
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
  android:gravity="center"
@@ -71,7 +71,7 @@
  android:padding="12dp"
  android:text="Placeholder" />
  </RelativeLayout>
- </android.support.v7.widget.CardView>
+ </androidx.cardview.widget.CardView>
 
  <Button
  android:layout_width="match_parent"

diff --git a/build.gradle b/build.gradle
@@ -17,13 +17,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
- ext.kotlin_version = '1.2.20'
+ ext.kotlin_version = '1.3.21'
  repositories {
- jcenter()
  google()
+ jcenter()
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:3.0.1'
+ classpath 'com.android.tools.build:gradle:3.3.1'
 
  // NOTE: Do not place your application dependencies here; they belong
  // in the individual module build.gradle files
@@ -33,8 +33,8 @@ buildscript {
 
 allprojects {
  repositories {
- jcenter()
  google()
+ jcenter()
  }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -29,8 +29,5 @@
 # http:https://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #Thu Feb 23 00:53:26 CST 2017
-systemProp.https.proxyPort=1087
-systemProp.http.proxyHost=127.0.0.1
-org.gradle.jvmargs=-Xmx1536m
-systemProp.https.proxyHost=127.0.0.1
-systemProp.http.proxyPort=1087
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jan 18 17:34:35 CST 2018
+#Fri Sep 28 16:46:10 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\:https://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\:https://services.gradle.org/distributions/gradle-4.10.1-all.zip