Skip to content

Commit

Permalink
update SDK and support versions
Browse files Browse the repository at this point in the history
  • Loading branch information
JoaquimLey committed Feb 5, 2018
1 parent 16cafd2 commit d20d87f
Show file tree
Hide file tree
Showing 25 changed files with 15 additions and 13 deletions.
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.0'
classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
}
}
Expand All @@ -29,5 +30,6 @@ plugins {
allprojects {
repositories {
jcenter()
google()
}
}
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon Mar 06 22:26:37 WET 2017
#Sun Feb 04 16:10:09 CET 2018
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-4.1-all.zip
File renamed without changes.
8 changes: 4 additions & 4 deletions faboptions/build.gradle → library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'

android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
compileSdkVersion 27
buildToolsVersion "27.0.0"

defaultConfig {
minSdkVersion 14
targetSdkVersion 25
targetSdkVersion 27
versionCode 11
versionName "1.1.2"
vectorDrawables.useSupportLibrary = true
Expand All @@ -39,7 +39,7 @@ android {
}

dependencies {
final DESIGN_LIBRARY_VERSION = '25.1.1'
final DESIGN_LIBRARY_VERSION = '27.0.2'

compile "com.android.support:design:$DESIGN_LIBRARY_VERSION"
}
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 5 additions & 5 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
compileSdkVersion 27
buildToolsVersion "27.0.0"

defaultConfig {
applicationId "com.joaquimley.faboptions.sample"
minSdkVersion 14
targetSdkVersion 25
targetSdkVersion 27
versionCode 6
versionName "1.0.1"
}
Expand All @@ -37,10 +37,10 @@ android {
}

dependencies {
final DESIGN_LIBRARY_VERSION = '25.1.1'
final DESIGN_LIBRARY_VERSION = '27.0.0'
final FABOPTIONS_VERSION = '1.1.1'

compile "com.android.support:design:$DESIGN_LIBRARY_VERSION"
// compile "com.github.joaquimley:faboptions:$FABOPTIONS_VERSION"
compile project(':faboptions')
compile project(':library')
}
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
* limitations under the License.
*/

include ':sample', ':faboptions'
include ':sample', ':library'

0 comments on commit d20d87f

Please sign in to comment.