From c23855160097d4a3ae205e3cf2584a9a4cda8e1b Mon Sep 17 00:00:00 2001 From: chengwangyong Date: Sat, 22 Apr 2017 18:58:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.name | 1 - .idea/gradle.xml | 8 +---- .../animated_vector_drawable_23_4_0.xml | 13 ------- .../animated_vector_drawable_25_1_1.xml | 12 +++++++ .idea/libraries/appcompat_v7_23_4_0.xml | 17 --------- .idea/libraries/appcompat_v7_25_1_1.xml | 12 +++++++ .../libraries/support_annotations_23_4_0.xml | 11 ------ .../libraries/support_annotations_25_1_1.xml | 11 ++++++ .idea/libraries/support_compat_25_1_1.xml | 12 +++++++ .idea/libraries/support_core_ui_25_1_1.xml | 12 +++++++ .idea/libraries/support_core_utils_25_1_1.xml | 12 +++++++ .idea/libraries/support_fragment_25_1_1.xml | 12 +++++++ .../libraries/support_media_compat_25_1_1.xml | 12 +++++++ .idea/libraries/support_v4_23_4_0.xml | 18 ---------- .idea/libraries/support_v4_25_1_1.xml | 10 ++++++ .../support_vector_drawable_23_4_0.xml | 13 ------- .../support_vector_drawable_25_1_1.xml | 12 +++++++ .idea/misc.xml | 10 ++++++ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +-- simple/build.gradle | 8 ++--- simple/simple.iml | 32 +++++++---------- stacklibrary/build.gradle | 9 +++-- stacklibrary/stacklibrary.iml | 36 ++++++++----------- 24 files changed, 167 insertions(+), 132 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/libraries/animated_vector_drawable_23_4_0.xml create mode 100644 .idea/libraries/animated_vector_drawable_25_1_1.xml delete mode 100644 .idea/libraries/appcompat_v7_23_4_0.xml create mode 100644 .idea/libraries/appcompat_v7_25_1_1.xml delete mode 100644 .idea/libraries/support_annotations_23_4_0.xml create mode 100644 .idea/libraries/support_annotations_25_1_1.xml create mode 100644 .idea/libraries/support_compat_25_1_1.xml create mode 100644 .idea/libraries/support_core_ui_25_1_1.xml create mode 100644 .idea/libraries/support_core_utils_25_1_1.xml create mode 100644 .idea/libraries/support_fragment_25_1_1.xml create mode 100644 .idea/libraries/support_media_compat_25_1_1.xml delete mode 100644 .idea/libraries/support_v4_23_4_0.xml create mode 100644 .idea/libraries/support_v4_25_1_1.xml delete mode 100644 .idea/libraries/support_vector_drawable_23_4_0.xml create mode 100644 .idea/libraries/support_vector_drawable_25_1_1.xml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index c616c68..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -FragmentTask \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ba7f69b..f2b9255 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -13,13 +13,7 @@ - + diff --git a/.idea/libraries/animated_vector_drawable_23_4_0.xml b/.idea/libraries/animated_vector_drawable_23_4_0.xml deleted file mode 100644 index f8a22fb..0000000 --- a/.idea/libraries/animated_vector_drawable_23_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/animated_vector_drawable_25_1_1.xml b/.idea/libraries/animated_vector_drawable_25_1_1.xml new file mode 100644 index 0000000..cafdbb5 --- /dev/null +++ b/.idea/libraries/animated_vector_drawable_25_1_1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/appcompat_v7_23_4_0.xml b/.idea/libraries/appcompat_v7_23_4_0.xml deleted file mode 100644 index a0a337a..0000000 --- a/.idea/libraries/appcompat_v7_23_4_0.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/appcompat_v7_25_1_1.xml b/.idea/libraries/appcompat_v7_25_1_1.xml new file mode 100644 index 0000000..7985ba1 --- /dev/null +++ b/.idea/libraries/appcompat_v7_25_1_1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_annotations_23_4_0.xml b/.idea/libraries/support_annotations_23_4_0.xml deleted file mode 100644 index 1dfe357..0000000 --- a/.idea/libraries/support_annotations_23_4_0.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_annotations_25_1_1.xml b/.idea/libraries/support_annotations_25_1_1.xml new file mode 100644 index 0000000..97bfec8 --- /dev/null +++ b/.idea/libraries/support_annotations_25_1_1.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_compat_25_1_1.xml b/.idea/libraries/support_compat_25_1_1.xml new file mode 100644 index 0000000..b6827c3 --- /dev/null +++ b/.idea/libraries/support_compat_25_1_1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_core_ui_25_1_1.xml b/.idea/libraries/support_core_ui_25_1_1.xml new file mode 100644 index 0000000..9b25efb --- /dev/null +++ b/.idea/libraries/support_core_ui_25_1_1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_core_utils_25_1_1.xml b/.idea/libraries/support_core_utils_25_1_1.xml new file mode 100644 index 0000000..97f60dc --- /dev/null +++ b/.idea/libraries/support_core_utils_25_1_1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_fragment_25_1_1.xml b/.idea/libraries/support_fragment_25_1_1.xml new file mode 100644 index 0000000..663e796 --- /dev/null +++ b/.idea/libraries/support_fragment_25_1_1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_media_compat_25_1_1.xml b/.idea/libraries/support_media_compat_25_1_1.xml new file mode 100644 index 0000000..06cea1f --- /dev/null +++ b/.idea/libraries/support_media_compat_25_1_1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_v4_23_4_0.xml b/.idea/libraries/support_v4_23_4_0.xml deleted file mode 100644 index e48cba4..0000000 --- a/.idea/libraries/support_v4_23_4_0.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_v4_25_1_1.xml b/.idea/libraries/support_v4_25_1_1.xml new file mode 100644 index 0000000..ba2768c --- /dev/null +++ b/.idea/libraries/support_v4_25_1_1.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/support_vector_drawable_23_4_0.xml b/.idea/libraries/support_vector_drawable_23_4_0.xml deleted file mode 100644 index a63020d..0000000 --- a/.idea/libraries/support_vector_drawable_23_4_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/support_vector_drawable_25_1_1.xml b/.idea/libraries/support_vector_drawable_25_1_1.xml new file mode 100644 index 0000000..e5bae81 --- /dev/null +++ b/.idea/libraries/support_vector_drawable_25_1_1.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 43d4a13..d6f323e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,15 @@ + + diff --git a/build.gradle b/build.gradle index 5a74188..251ca76 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0' + classpath 'com.android.tools.build:gradle:2.3.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ce36385..0b78613 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Jun 03 20:48:34 CST 2016 +#Sat Apr 22 18:56:38 CST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/simple/build.gradle b/simple/build.gradle index 035b123..ed8a114 100644 --- a/simple/build.gradle +++ b/simple/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.2" + compileSdkVersion 25 + buildToolsVersion "25.0.2" defaultConfig { applicationId "com.mrwang.simple" minSdkVersion 15 - targetSdkVersion 23 + targetSdkVersion 25 versionCode 1 versionName "1.0" } @@ -22,6 +22,6 @@ android { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:23.4.0' + compile 'com.android.support:appcompat-v7:25.1.1' compile project(':stacklibrary') } diff --git a/simple/simple.iml b/simple/simple.iml index ac1ab4d..45d82d0 100644 --- a/simple/simple.iml +++ b/simple/simple.iml @@ -9,7 +9,6 @@