diff --git a/.travis.yml b/.travis.yml index 809eaf8..e1e5d4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,11 +13,13 @@ android: - tools - tools - platform-tools - - build-tools-24.0.3 - - android-24 + - build-tools-26.0. + - android-19 + - android-26 - extra-google-google_play_services - extra-google-m2repository - extra-android-m2repository + - sys-img-armeabi-v7a-android-19 licenses: - '.+' diff --git a/app/build.gradle b/app/build.gradle index dc2becc..8e7b1d6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,12 +4,12 @@ apply from: '../jacoco-android.gradle' apply from: "$rootDir/versions.gradle" android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion project.compileSdkVersion + buildToolsVersion project.buildToolsVersion defaultConfig { applicationId "agency.tango.materialintro" - minSdkVersion 15 - targetSdkVersion 25 + minSdkVersion project.minSdkVersion + targetSdkVersion project.targetSdkVersion versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/build.gradle b/build.gradle index 8a312c7..db55464 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + maven { url 'https://maven.google.com' } } dependencies { - classpath 'com.android.tools.build:gradle:2.3.0' + classpath 'com.android.tools.build:gradle:2.3.3' classpath 'com.novoda:bintray-release:0.3.4' classpath 'com.dicedmelon.gradle:jacoco-android:0.1.1' classpath 'com.palantir:jacoco-coverage:0.4.0' @@ -17,6 +18,7 @@ buildscript { allprojects { repositories { jcenter() + maven { url 'https://maven.google.com' } } tasks.withType(Javadoc) { diff --git a/material-intro-screen/build.gradle b/material-intro-screen/build.gradle index 2302f22..157a28f 100644 --- a/material-intro-screen/build.gradle +++ b/material-intro-screen/build.gradle @@ -4,13 +4,13 @@ apply from: '../jacoco-android.gradle' apply from: "$rootDir/versions.gradle" android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion project.compileSdkVersion + buildToolsVersion project.buildToolsVersion resourcePrefix 'mis_' defaultConfig { - minSdkVersion 15 - targetSdkVersion 25 + minSdkVersion project.minSdkVersion + targetSdkVersion project.targetSdkVersion versionCode 1 versionName "1.0" diff --git a/material-intro-screen/src/main/res/layout-land/mis_fragment_slide.xml b/material-intro-screen/src/main/res/layout-land/mis_fragment_slide.xml index ddbe0e0..4e66dc0 100644 --- a/material-intro-screen/src/main/res/layout-land/mis_fragment_slide.xml +++ b/material-intro-screen/src/main/res/layout-land/mis_fragment_slide.xml @@ -39,7 +39,6 @@ android:layout_height="wrap_content" android:gravity="center" android:textAppearance="@style/TextAppearance.AppCompat.Headline" - app:mis_layout_parallaxFactor="0.5" tools:text="Lorem ipsum" /> diff --git a/material-intro-screen/src/main/res/values/styles.xml b/material-intro-screen/src/main/res/values/styles.xml index 9f37492..0addbdc 100644 --- a/material-intro-screen/src/main/res/values/styles.xml +++ b/material-intro-screen/src/main/res/values/styles.xml @@ -6,7 +6,7 @@ true - diff --git a/versions.gradle b/versions.gradle index f3aab11..99b5173 100644 --- a/versions.gradle +++ b/versions.gradle @@ -1 +1,6 @@ -ext.androidSupport = "25.1.1" +ext.minSdkVersion = 21 +ext.targetSdkVersion = 25 +ext.compileSdkVersion = 26 +ext.buildToolsVersion = '26.0.1' +ext.androidSupport = "26.1.0" +