Cleaned up Gradle stuff

build.gradle

@@ -1,9 +1,14 @@
+apply from: './dependencies.gradle'
+
 buildscript {
+    apply from: './dependencies.gradle'
+
     repositories {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:' + versions.gradlePlugin
+        classpath 'com.novoda:bintray-release:' + versions.bintrayRelease
     }
 }
 

commons/build.gradle

@@ -1,23 +1,16 @@
 apply plugin: 'com.android.library'
-
-ext {
-    PUBLISH_GROUP_ID = 'com.afollestad.material-dialogs'
-    PUBLISH_ARTIFACT_ID = 'commons'
-    PUBLISH_VERSION = '0.9.3.0'
-    SUPPORT_LIBRARY_VERSION = '25.2.0'
-    BUILD_TOOLS = "25.0.2"
-    TARGET_SDK = 25
-}
+apply from: '../dependencies.gradle'
+//apply plugin: 'com.novoda.bintray-release'
 
 android {
-    compileSdkVersion TARGET_SDK
-    buildToolsVersion BUILD_TOOLS
+    compileSdkVersion versions.compileSdk
+    buildToolsVersion versions.buildTools
 
     defaultConfig {
-        minSdkVersion 13
-        targetSdkVersion TARGET_SDK
-        versionCode 1
-        versionName PUBLISH_VERSION
+        minSdkVersion versions.minSdk
+        targetSdkVersion versions.compileSdk
+        versionCode versions.publishVersionCode
+        versionName versions.publishVersion
     }
     lintOptions {
         abortOnError false
@@ -26,9 +19,15 @@ android {
 }
 
 dependencies {
-    compile "com.android.support:support-v13:$SUPPORT_LIBRARY_VERSION"
-    compile "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION"
+    compile 'com.android.support:support-v13:' + versions.supportLib
+    compile 'com.android.support:appcompat-v7:' + versions.supportLib
     compile project(':core')
 }
 
-apply from: 'https://raw.githubusercontent.com/afollestad/aidanfollestad.com/master/android-lib-release.gradle'
+//publish {
+//    userOrg = 'drummer-aidan'
+//    groupId = 'com.afollesetad'
+//    artifactId = 'material-dialogs:commons'
+//    publishVersion = versions.publishVersion
+//    website = 'https://github.com/afollestad/material-dialogs'
+//}

core/build.gradle

@@ -1,23 +1,16 @@
 apply plugin: 'com.android.library'
-
-ext {
-    PUBLISH_GROUP_ID = 'com.afollestad.material-dialogs'
-    PUBLISH_ARTIFACT_ID = 'core'
-    PUBLISH_VERSION = '0.9.3.0'
-    SUPPORT_LIBRARY_VERSION = '25.2.0'
-    BUILD_TOOLS = "25.0.2"
-    TARGET_SDK = 25
-}
+apply from: '../dependencies.gradle'
+//apply plugin: 'com.novoda.bintray-release'
 
 android {
-    compileSdkVersion TARGET_SDK
-    buildToolsVersion BUILD_TOOLS
+    compileSdkVersion versions.compileSdk
+    buildToolsVersion versions.buildTools
 
     defaultConfig {
-        minSdkVersion 13
-        targetSdkVersion TARGET_SDK
-        versionCode 1
-        versionName PUBLISH_VERSION
+        minSdkVersion versions.minSdk
+        targetSdkVersion versions.compileSdk
+        versionCode versions.publishVersionCode
+        versionName versions.publishVersion
         consumerProguardFiles 'progress-proguard.txt'
     }
     lintOptions {
@@ -27,11 +20,17 @@ android {
 }
 
 dependencies {
-    compile "com.android.support:support-v13:$SUPPORT_LIBRARY_VERSION"
-    compile "com.android.support:appcompat-v7:$SUPPORT_LIBRARY_VERSION"
-    compile "com.android.support:recyclerview-v7:$SUPPORT_LIBRARY_VERSION"
-    compile "com.android.support:support-annotations:$SUPPORT_LIBRARY_VERSION"
-    compile "me.zhanghai.android.materialprogressbar:library:1.3.0"
+    compile 'com.android.support:support-v13:' + versions.supportLib
+    compile 'com.android.support:appcompat-v7:' + versions.supportLib
+    compile 'com.android.support:recyclerview-v7:' + versions.supportLib
+    compile 'com.android.support:support-annotations:' + versions.supportLib
+    compile 'me.zhanghai.android.materialprogressbar:library:' + versions.mdProgressBar
 }
 
-apply from: 'https://raw.githubusercontent.com/afollestad/aidanfollestad.com/master/android-lib-release.gradle'
+//publish {
+//    userOrg = 'drummer-aidan'
+//    groupId = 'com.afollesetad'
+//    artifactId = 'material-dialogs:core'
+//    publishVersion = versions.publishVersion
+//    website = 'https://github.com/afollestad/material-dialogs'
+//}

dependencies.gradle

@@ -0,0 +1,12 @@
+ext.versions = [
+        minSdk: 13,
+        compileSdk: 25,
+        buildTools: '25.0.2',
+        publishVersion: '0.9.3.0',
+        publishVersionCode: 171,
+        gradlePlugin: '2.3.0',
+        supportLib: '25.2.0',
+        mdProgressBar: '1.3.0',
+        butterKnife: '8.1.0',
+        bintrayRelease: '0.4.0'
+]

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-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.zip

sample/build.gradle

@@ -1,36 +1,27 @@
+apply from: '../dependencies.gradle'
+
 buildscript {
     repositories {
         mavenCentral()
     }
+    dependencies {
+        classpath 'me.tatarka:gradle-retrolambda:3.6.0'
+    }
 }
 
 apply plugin: 'com.android.application'
-
-ext {
-    PUBLISH_VERSION = '0.9.3.0'
-    SUPPORT_LIBRARY_VERSION = '25.2.0'
-    BUILD_TOOLS = "25.0.2"
-    TARGET_SDK = 25
-}
+apply plugin: 'me.tatarka.retrolambda'
 
 android {
-    compileSdkVersion TARGET_SDK
-    buildToolsVersion BUILD_TOOLS
+    compileSdkVersion versions.compileSdk
+    buildToolsVersion versions.buildTools
 
     defaultConfig {
         applicationId "com.afollestad.materialdialogssample"
-        minSdkVersion 13
-        targetSdkVersion TARGET_SDK
-        versionCode 171
-        versionName PUBLISH_VERSION
-
-        jackOptions {
-            enabled true
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        minSdkVersion versions.minSdk
+        targetSdkVersion versions.compileSdk
+        versionCode versions.publishVersionCode
+        versionName versions.publishVersion
     }
     lintOptions {
         abortOnError false
@@ -46,7 +37,9 @@ android {
 dependencies {
     compile project(':core')
     compile project(':commons')
-    compile "com.android.support:gridlayout-v7:$SUPPORT_LIBRARY_VERSION"
-    compile 'com.jakewharton:butterknife:8.1.0'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.1.0'
+
+    compile 'com.android.support:gridlayout-v7:' + versions.supportLib
+
+    compile 'com.jakewharton:butterknife:' + versions.butterKnife
+    annotationProcessor 'com.jakewharton:butterknife-compiler:' + versions.butterKnife
 }