From d20d87f1cbd8b7da8224d259d227a316bdadb7b6 Mon Sep 17 00:00:00 2001 From: Joaquim Ley Date: Mon, 5 Feb 2018 09:21:16 +0100 Subject: [PATCH] update SDK and support versions --- build.gradle | 4 +++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- {faboptions => library}/.gitignore | 0 {faboptions => library}/build.gradle | 8 ++++---- {faboptions => library}/proguard-rules.pro | 0 {faboptions => library}/src/main/AndroidManifest.xml | 0 .../java/com/joaquimley/faboptions/FabOptions.java | 0 .../com/joaquimley/faboptions/FabOptionsBehavior.java | 0 .../faboptions/FabOptionsButtonContainer.java | 0 .../src/main/res/anim/open_morph_animation.xml | 0 .../src/main/res/animator/close_to_overflow.xml | 0 .../src/main/res/animator/overflow_to_close.xml | 0 .../src/main/res/drawable/faboptions_background.xml | 0 .../src/main/res/drawable/faboptions_ic_close.xml | 0 .../res/drawable/faboptions_ic_close_animatable.xml | 0 .../res/drawable/faboptions_ic_menu_animatable.xml | 0 .../src/main/res/drawable/faboptions_ic_overflow.xml | 0 .../src/main/res/layout/faboptions_button.xml | 0 .../src/main/res/layout/faboptions_layout.xml | 0 .../src/main/res/layout/faboptions_separator.xml | 0 {faboptions => library}/src/main/res/values/attrs.xml | 0 {faboptions => library}/src/main/res/values/dimens.xml | 0 .../src/main/res/values/strings.xml | 0 sample/build.gradle | 10 +++++----- settings.gradle | 2 +- 25 files changed, 15 insertions(+), 13 deletions(-) rename {faboptions => library}/.gitignore (100%) rename {faboptions => library}/build.gradle (90%) rename {faboptions => library}/proguard-rules.pro (100%) rename {faboptions => library}/src/main/AndroidManifest.xml (100%) rename {faboptions => library}/src/main/java/com/joaquimley/faboptions/FabOptions.java (100%) rename {faboptions => library}/src/main/java/com/joaquimley/faboptions/FabOptionsBehavior.java (100%) rename {faboptions => library}/src/main/java/com/joaquimley/faboptions/FabOptionsButtonContainer.java (100%) rename {faboptions => library}/src/main/res/anim/open_morph_animation.xml (100%) rename {faboptions => library}/src/main/res/animator/close_to_overflow.xml (100%) rename {faboptions => library}/src/main/res/animator/overflow_to_close.xml (100%) rename {faboptions => library}/src/main/res/drawable/faboptions_background.xml (100%) rename {faboptions => library}/src/main/res/drawable/faboptions_ic_close.xml (100%) rename {faboptions => library}/src/main/res/drawable/faboptions_ic_close_animatable.xml (100%) rename {faboptions => library}/src/main/res/drawable/faboptions_ic_menu_animatable.xml (100%) rename {faboptions => library}/src/main/res/drawable/faboptions_ic_overflow.xml (100%) rename {faboptions => library}/src/main/res/layout/faboptions_button.xml (100%) rename {faboptions => library}/src/main/res/layout/faboptions_layout.xml (100%) rename {faboptions => library}/src/main/res/layout/faboptions_separator.xml (100%) rename {faboptions => library}/src/main/res/values/attrs.xml (100%) rename {faboptions => library}/src/main/res/values/dimens.xml (100%) rename {faboptions => library}/src/main/res/values/strings.xml (100%) diff --git a/build.gradle b/build.gradle index 42c6985..a4bf018 100644 --- a/build.gradle +++ b/build.gradle @@ -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' } } @@ -29,5 +30,6 @@ plugins { allprojects { repositories { jcenter() + google() } } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3ef1f4c..76d88f1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/faboptions/.gitignore b/library/.gitignore similarity index 100% rename from faboptions/.gitignore rename to library/.gitignore diff --git a/faboptions/build.gradle b/library/build.gradle similarity index 90% rename from faboptions/build.gradle rename to library/build.gradle index b1398b9..0f79206 100644 --- a/faboptions/build.gradle +++ b/library/build.gradle @@ -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 @@ -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" } diff --git a/faboptions/proguard-rules.pro b/library/proguard-rules.pro similarity index 100% rename from faboptions/proguard-rules.pro rename to library/proguard-rules.pro diff --git a/faboptions/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml similarity index 100% rename from faboptions/src/main/AndroidManifest.xml rename to library/src/main/AndroidManifest.xml diff --git a/faboptions/src/main/java/com/joaquimley/faboptions/FabOptions.java b/library/src/main/java/com/joaquimley/faboptions/FabOptions.java similarity index 100% rename from faboptions/src/main/java/com/joaquimley/faboptions/FabOptions.java rename to library/src/main/java/com/joaquimley/faboptions/FabOptions.java diff --git a/faboptions/src/main/java/com/joaquimley/faboptions/FabOptionsBehavior.java b/library/src/main/java/com/joaquimley/faboptions/FabOptionsBehavior.java similarity index 100% rename from faboptions/src/main/java/com/joaquimley/faboptions/FabOptionsBehavior.java rename to library/src/main/java/com/joaquimley/faboptions/FabOptionsBehavior.java diff --git a/faboptions/src/main/java/com/joaquimley/faboptions/FabOptionsButtonContainer.java b/library/src/main/java/com/joaquimley/faboptions/FabOptionsButtonContainer.java similarity index 100% rename from faboptions/src/main/java/com/joaquimley/faboptions/FabOptionsButtonContainer.java rename to library/src/main/java/com/joaquimley/faboptions/FabOptionsButtonContainer.java diff --git a/faboptions/src/main/res/anim/open_morph_animation.xml b/library/src/main/res/anim/open_morph_animation.xml similarity index 100% rename from faboptions/src/main/res/anim/open_morph_animation.xml rename to library/src/main/res/anim/open_morph_animation.xml diff --git a/faboptions/src/main/res/animator/close_to_overflow.xml b/library/src/main/res/animator/close_to_overflow.xml similarity index 100% rename from faboptions/src/main/res/animator/close_to_overflow.xml rename to library/src/main/res/animator/close_to_overflow.xml diff --git a/faboptions/src/main/res/animator/overflow_to_close.xml b/library/src/main/res/animator/overflow_to_close.xml similarity index 100% rename from faboptions/src/main/res/animator/overflow_to_close.xml rename to library/src/main/res/animator/overflow_to_close.xml diff --git a/faboptions/src/main/res/drawable/faboptions_background.xml b/library/src/main/res/drawable/faboptions_background.xml similarity index 100% rename from faboptions/src/main/res/drawable/faboptions_background.xml rename to library/src/main/res/drawable/faboptions_background.xml diff --git a/faboptions/src/main/res/drawable/faboptions_ic_close.xml b/library/src/main/res/drawable/faboptions_ic_close.xml similarity index 100% rename from faboptions/src/main/res/drawable/faboptions_ic_close.xml rename to library/src/main/res/drawable/faboptions_ic_close.xml diff --git a/faboptions/src/main/res/drawable/faboptions_ic_close_animatable.xml b/library/src/main/res/drawable/faboptions_ic_close_animatable.xml similarity index 100% rename from faboptions/src/main/res/drawable/faboptions_ic_close_animatable.xml rename to library/src/main/res/drawable/faboptions_ic_close_animatable.xml diff --git a/faboptions/src/main/res/drawable/faboptions_ic_menu_animatable.xml b/library/src/main/res/drawable/faboptions_ic_menu_animatable.xml similarity index 100% rename from faboptions/src/main/res/drawable/faboptions_ic_menu_animatable.xml rename to library/src/main/res/drawable/faboptions_ic_menu_animatable.xml diff --git a/faboptions/src/main/res/drawable/faboptions_ic_overflow.xml b/library/src/main/res/drawable/faboptions_ic_overflow.xml similarity index 100% rename from faboptions/src/main/res/drawable/faboptions_ic_overflow.xml rename to library/src/main/res/drawable/faboptions_ic_overflow.xml diff --git a/faboptions/src/main/res/layout/faboptions_button.xml b/library/src/main/res/layout/faboptions_button.xml similarity index 100% rename from faboptions/src/main/res/layout/faboptions_button.xml rename to library/src/main/res/layout/faboptions_button.xml diff --git a/faboptions/src/main/res/layout/faboptions_layout.xml b/library/src/main/res/layout/faboptions_layout.xml similarity index 100% rename from faboptions/src/main/res/layout/faboptions_layout.xml rename to library/src/main/res/layout/faboptions_layout.xml diff --git a/faboptions/src/main/res/layout/faboptions_separator.xml b/library/src/main/res/layout/faboptions_separator.xml similarity index 100% rename from faboptions/src/main/res/layout/faboptions_separator.xml rename to library/src/main/res/layout/faboptions_separator.xml diff --git a/faboptions/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml similarity index 100% rename from faboptions/src/main/res/values/attrs.xml rename to library/src/main/res/values/attrs.xml diff --git a/faboptions/src/main/res/values/dimens.xml b/library/src/main/res/values/dimens.xml similarity index 100% rename from faboptions/src/main/res/values/dimens.xml rename to library/src/main/res/values/dimens.xml diff --git a/faboptions/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml similarity index 100% rename from faboptions/src/main/res/values/strings.xml rename to library/src/main/res/values/strings.xml diff --git a/sample/build.gradle b/sample/build.gradle index 729529f..5cccdc7 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -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" } @@ -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') } diff --git a/settings.gradle b/settings.gradle index 38d35b4..d34153c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,4 +14,4 @@ * limitations under the License. */ -include ':sample', ':faboptions' +include ':sample', ':library'