浏览代码

Update dependencies, target API 24

plusCubed 8 年之前
父节点
当前提交
c100175508

+ 3 - 2
.travis.yml

@@ -1,10 +1,11 @@
 language: android
+jdk: oraclejdk8
 android:
   components:
     - tools
     - platform-tools
-    - build-tools-23.0.3
-    - android-23
+    - build-tools-24.0.0
+    - android-24
     - extra-android-support
     - extra-android-m2repository
     - extra-google-m2repository

+ 4 - 4
commons/build.gradle

@@ -4,16 +4,16 @@ ext {
     PUBLISH_GROUP_ID = 'com.afollestad.material-dialogs'
     PUBLISH_ARTIFACT_ID = 'commons'
     PUBLISH_VERSION = '0.8.5.9'
-    SUPPORT_LIBRARY_VERSION = '23.4.0'
+    SUPPORT_LIBRARY_VERSION = '24.0.0'
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.0"
 
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 1
         versionName "${PUBLISH_VERSION}"
     }

+ 4 - 4
core/build.gradle

@@ -4,16 +4,16 @@ ext {
     PUBLISH_GROUP_ID = 'com.afollestad.material-dialogs'
     PUBLISH_ARTIFACT_ID = 'core'
     PUBLISH_VERSION = '0.8.5.9'
-    SUPPORT_LIBRARY_VERSION = '23.4.0'
+    SUPPORT_LIBRARY_VERSION = '24.0.0'
 }
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.0"
 
     defaultConfig {
         minSdkVersion 8
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 1
         versionName "${PUBLISH_VERSION}"
         consumerProguardFiles 'progress-proguard.txt'

+ 1 - 1
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.11-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip

+ 16 - 5
sample/build.gradle

@@ -1,8 +1,18 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
+    }
+}
+
 apply plugin: 'com.android.application'
+apply plugin: 'com.neenbedankt.android-apt'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.0"
 
     signingConfigs {
         production {
@@ -16,7 +26,7 @@ android {
     defaultConfig {
         applicationId "com.afollestad.materialdialogssample"
         minSdkVersion 9
-        targetSdkVersion 23
+        targetSdkVersion 24
         versionCode 160
         versionName "0.8.5.8"
     }
@@ -39,6 +49,7 @@ android {
 dependencies {
     compile project(':core')
     compile project(':commons')
-    compile 'com.android.support:gridlayout-v7:23.3.0'
-    compile 'com.jakewharton:butterknife:7.0.1'
+    compile 'com.android.support:gridlayout-v7:24.0.0'
+    compile 'com.jakewharton:butterknife:8.1.0'
+    apt 'com.jakewharton:butterknife-compiler:8.1.0'
 }

+ 2 - 5
sample/src/main/java/com/afollestad/materialdialogssample/MainActivity.java

@@ -53,19 +53,17 @@ import butterknife.OnClick;
 public class MainActivity extends AppCompatActivity implements
         FolderChooserDialog.FolderCallback, FileChooserDialog.FileCallback, ColorChooserDialog.ColorCallback {
 
+    private final static int STORAGE_PERMISSION_RC = 69;
     // custom view dialog
     private EditText passwordInput;
     private View positiveAction;
-
     // color chooser dialog
     private int primaryPreselect;
-    private int accentPreselect;
 
     // UTILITY METHODS
-
+    private int accentPreselect;
     private Toast mToast;
     private Thread mThread;
-    private final static int STORAGE_PERMISSION_RC = 69;
     private Handler mHandler;
 
     private int chooserDialog;
@@ -106,7 +104,6 @@ public class MainActivity extends AppCompatActivity implements
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        ButterKnife.unbind(this);
         mHandler = null;
     }