From 3dc98cb2cf9b197729781a3eefbc68a3a2c6b1a8 Mon Sep 17 00:00:00 2001 From: ForgetSky <275514805@qq.com> Date: Mon, 19 Nov 2018 12:02:23 +0800 Subject: [PATCH] update config --- .idea/.name | 1 + .idea/caches/build_file_checksums.ser | Bin 538 -> 538 bytes .idea/compiler.xml | 22 ++++++++++++ .idea/copyright/profiles_settings.xml | 3 ++ .idea/encodings.xml | 6 ++++ .idea/inspectionProfiles/Project_Default.xml | 36 ------------------- .idea/misc.xml | 28 ++++++++++++--- .idea/vcs.xml | 2 +- app/build.gradle | 3 +- build.gradle | 5 ++- config.gradle | 6 ++-- 11 files changed, 62 insertions(+), 50 deletions(-) create mode 100644 .idea/.name create mode 100644 .idea/compiler.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 .idea/encodings.xml delete mode 100644 .idea/inspectionProfiles/Project_Default.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..3e04f63 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +Awesome-WanAndroid \ No newline at end of file diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 16aadfd56c34b5321dac56c87a47af791f00b74e..eefb3cb96d315efa835c84c0a532d641419998d2 100644 GIT binary patch delta 141 zcmV;80CNAD1eyepm<00!v7eEgcM#H)C0Ru!AOf9xIejNKJbaTQ0WK#DVs&Y3WG-iN zVPtG&b#VZG00sa601)G9%EV2)8%G#ihZx)>+y0Zj0UZ$SU#9E#xJDb_?@vB&jv?BU v>j5qjbO0$sI$TwAWpZ;|cVTX4cxIDf0VEN2#~>+WV#@6f)(OajjP09v$09fe delta 140 zcmV;70CWGE1eyepm;_-;kOq;QcM#~b=RQC~dL;Tp%h7^t8Jd$L0WJ_JLpoelb7gXK zTyb?{Xkl-Y3|8C?D#@{lTQH|5GXc9rXt7S>Kg!!*r|dh>W_7dR9E diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..96cc43e --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ 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 6560a98..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index cc51e58..8dfe93b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,16 +1,18 @@ + + + @@ -25,10 +27,26 @@ - + + + + + + 1.8 + + + + + + + \ No newline at end of file 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 5d6a29c..7a908de 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,14 +1,13 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' -apply plugin: 'com.jakewharton.butterknife' apply plugin: 'org.greenrobot.greendao' apply from: 'jacoco.gradle' android { compileSdkVersion rootProject.ext.android["compileSdkVersion"] - buildToolsVersion rootProject.ext.android["buildToolsVersion"] + buildToolsVersion '28.0.3' signingConfigs { // release { // storeFile file(RELEASE_STORE_FILE) diff --git a/build.gradle b/build.gradle index 8c887f2..42b8093 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. apply from: "config.gradle" buildscript { - ext.kotlin_version = '1.2.10' + ext.kotlin_version = '1.2.71' repositories { google() jcenter() @@ -9,8 +9,7 @@ buildscript { maven { url 'https://maven.google.com' } } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' - classpath 'com.jakewharton:butterknife-gradle-plugin:8.4.0' + classpath 'com.android.tools.build:gradle:3.2.1' classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2' classpath 'me.tatarka:gradle-retrolambda:3.2.5' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" diff --git a/config.gradle b/config.gradle index fcbfb10..ea013e8 100644 --- a/config.gradle +++ b/config.gradle @@ -64,8 +64,8 @@ ext { "dagger-android-support" : "com.google.dagger:dagger-android-support:${version["daggerVersion"]}", "dagger-android-processor" : "com.google.dagger:dagger-android-processor:${version["daggerVersion"]}", "javax_annotation" : "org.glassfish:javax.annotation:10.0-b28", - "butterknife" : "com.jakewharton:butterknife:${version["butterknifeVersion"]}", - "butterknife-compiler" : "com.jakewharton:butterknife-compiler:${version["butterknifeVersion"]}", + "butterknife" : "com.jakewharton:butterknife:8.8.1", + "butterknife-compiler" : "com.jakewharton:butterknife-compiler:8.8.1", //multidex "multidex" : "com.android.support:multidex:1.0.3", @@ -75,7 +75,7 @@ ext { "leakcanary-android-no-op" : "com.squareup.leakcanary:leakcanary-android-no-op:${version["leakcanaryVersion"]}", //kotlin - "kotlin-stdlib" : "org.jetbrains.kotlin:kotlin-stdlib:1.2.10", + "kotlin-stdlib" : "org.jetbrains.kotlin:kotlin-stdlib:1.2.71", //other "lottie" : "com.airbnb.android:lottie:2.3.0",