diff --git a/app/build.gradle b/app/build.gradle index 30c61d6..f8ed93f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,6 +14,8 @@ android { targetSdkVersion setup.targetSdk versionCode release.versionCode versionName release.versionName + + setProperty("archivesBaseName", "Materialize-v$versionName-c$versionCode") } buildTypes { debug { @@ -48,7 +50,7 @@ dependencies { //used to generate the drawer on the left //https://github.com/mikepenz/MaterialDrawer - implementation('com.mikepenz:materialdrawer:6.0.0@aar') { + implementation('com.mikepenz:materialdrawer:6.1.0-rc01') { transitive = true exclude group: 'com.android.support' exclude group: 'com.mikepenz', module: 'materialize' @@ -56,7 +58,7 @@ dependencies { // used to generate the Open Source section // https://github.com/mikepenz/AboutLibraries - implementation('com.mikepenz:aboutlibraries:6.0.0@aar') { + implementation('com.mikepenz:aboutlibraries:6.2.0-rc01') { transitive = true exclude group: 'com.android.support' } diff --git a/build.gradle b/build.gradle index 3c5248d..572ed89 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { release = [ - versionName: "1.2.0-rc01", + versionName: "1.2.0", versionCode: 1200 ] @@ -13,8 +13,8 @@ buildscript { ] versions = [ - androidXVersion: '1.0.0-rc01', - materialVersion: '1.0.0-rc01' + androidXVersion: '1.0.0', + materialVersion: '1.0.0' ] } @@ -24,7 +24,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.3.0-alpha11' classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 87a5f05..469ad5a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Oct 25 15:45:55 CEST 2017 +#Sat Sep 22 15:04:44 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip