From 2ea9b403f1362d7d2146cdcdb79352fc74247e88 Mon Sep 17 00:00:00 2001 From: zhangxl2 Date: Tue, 12 Feb 2019 17:48:11 +0800 Subject: [PATCH] update version(grade, kotlin, support library etc.) --- .idea/codeStyles/Project.xml | 29 +++++++++++++++++++ .idea/compiler.xml | 22 -------------- .idea/copyright/ApacheV2.xml | 6 ---- .idea/copyright/profiles_settings.xml | 7 ----- .idea/encodings.xml | 6 ---- .idea/inspectionProfiles/Project_Default.xml | 9 ------ .../inspectionProfiles/profiles_settings.xml | 7 ----- .idea/misc.xml | 29 ++++--------------- .idea/vcs.xml | 2 +- app/build.gradle | 29 +++++++++---------- .../ExampleInstrumentedTest.java | 4 +-- .../activitystack/LaunchActivityService.java | 2 +- .../aesean/activitystack/MainActivity.java | 2 +- .../aesean/activitystack/SecondActivity.java | 2 +- .../ShowMoreAnimationActivityActivity.kt | 2 +- .../activitystack/utils/LifecycleUtils.java | 6 ++-- .../activitystack/utils/TextViewUtils.java | 8 ++--- .../activitystack/utils/ThreadMonitor.java | 2 +- .../utils/shake/ShakeManager.java | 4 +-- .../activity_show_more_animation_activity.xml | 4 +-- build.gradle | 8 ++--- gradle.properties | 7 ++--- gradle/wrapper/gradle-wrapper.properties | 4 +-- 23 files changed, 75 insertions(+), 126 deletions(-) create mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/ApacheV2.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/ApacheV2.xml b/.idea/copyright/ApacheV2.xml deleted file mode 100644 index fade0b4..0000000 --- a/.idea/copyright/ApacheV2.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index ae00b3f..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 97626ba..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 1c2b4c8..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 3b31283..0000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 59f8a0c..af0bbdd 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,30 +1,11 @@ - - - + + + + - + diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 0560724..12a60bd 100644 --- 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' \ No newline at end of file diff --git a/app/src/androidTest/java/com/aesean/activitystack/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/aesean/activitystack/ExampleInstrumentedTest.java index 3cdeded..798aede 100644 --- 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 index 4c1f303..908a97d 100644 --- 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 index d3280c4..5168aee 100644 --- 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 index da6e176..85665f5 100644 --- 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 index 3eafed2..8722d54 100644 --- 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 index 9c82f9b..1095602 100644 --- 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 index a342f31..e145bae 100644 --- 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 index f79ca5c..c93a128 100644 --- 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 index f45d8ec..a15cb9d 100644 --- 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 index 3cb25cd..17637b0 100644 --- 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" /> - - +