Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
- '.+'

Expand Down
8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -17,6 +18,7 @@ buildscript {
allprojects {
repositories {
jcenter()
maven { url 'https://maven.google.com' }
}

tasks.withType(Javadoc) {
Expand Down
8 changes: 4 additions & 4 deletions material-intro-screen/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

<TextView
Expand All @@ -48,7 +47,6 @@
android:layout_height="wrap_content"
android:gravity="center"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
app:mis_layout_parallaxFactor="0.2"
tools:text="Lorem ipsum dolor sit amet, consectetur, adipisci velit, …" />

</LinearLayout>
Expand Down
2 changes: 1 addition & 1 deletion material-intro-screen/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<item name="android:windowIsTranslucent">true</item>
</style>

<style name="ColoredButton" parent="Widget.AppCompat.Button.Colored" tools:ignore="ResourceName">
<style name="Widget.ColoredButton" parent="Widget.AppCompat.Button.Colored" tools:ignore="ResourceName">
<item name="colorButtonNormal">@android:color/white</item>
<item name="android:textColor">@android:color/black</item>
</style>
Expand Down
7 changes: 6 additions & 1 deletion versions.gradle
Original file line number Diff line number Diff line change
@@ -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"