Skip to content

Commit 740b402

Browse files
committed
update dependencies
1 parent b8e8016 commit 740b402

File tree

5 files changed

+18
-21
lines changed

5 files changed

+18
-21
lines changed

gradle.properties

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
# limitations under the License.
1515
#
1616

17-
GRADLE_PLUGIN_VERSION=3.0.1
18-
BUILD_TOOLS_VERSION=27.0.1
19-
KOTLIN_VERSION=1.2.0
17+
GRADLE_PLUGIN_VERSION=3.1.2
18+
BUILD_TOOLS_VERSION=27.0.3
19+
KOTLIN_VERSION=1.2.41
2020

21-
ANDROID_SUPPORT_VERSION=27.0.2
21+
ANDROID_SUPPORT_VERSION=27.1.1
2222

2323
MIN_SDK=15
2424
TARGET_SDK=27
2525
COMPILE_SDK=27
2626

27-
VERSION_NAME=1.0.3
28-
VERSION_CODE=2
27+
VERSION_NAME=1.0.4
28+
VERSION_CODE=3
2929
GROUP=com.klinkerapps
3030

3131
POM_DESCRIPTION=Android floating tutorial pager activity

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

library/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ android {
5151
}
5252

5353
dependencies {
54-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$KOTLIN_VERSION"
54+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"
5555
implementation "com.android.support:appcompat-v7:$ANDROID_SUPPORT_VERSION"
5656
implementation "com.android.support:cardview-v7:$ANDROID_SUPPORT_VERSION"
5757

5858
testImplementation 'junit:junit:4.12'
59-
testImplementation "org.robolectric:robolectric:3.4.2"
59+
testImplementation "org.robolectric:robolectric:3.6.1"
6060
testImplementation 'org.mockito:mockito-core:2.8.43'
6161
}
6262

library/src/main/res/values-v19/styles.xml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
1+
<?xml version="1.0" encoding="utf-8"?><!--
32
~ Copyright (C) 2017 Luke Klinker
43
~
54
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +16,12 @@
1716

1817
<resources>
1918

20-
<style name="tutorial_FloatingTutorialTheme" parent="tutorial_FloatingTutorialTheme.Base">
19+
<style name="tutorial_FloatingTutorialTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
20+
<item name="colorAccent">@android:color/white</item>
21+
<item name="android:background">@android:color/transparent</item>
22+
<item name="android:windowNoTitle">true</item>
23+
<item name="android:windowBackground">@android:color/transparent</item>
24+
<item name="android:windowIsTranslucent">true</item>
2125
<item name="android:windowTranslucentStatus">true</item>
2226
</style>
2327

library/src/main/res/values/styles.xml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
1+
<?xml version="1.0" encoding="utf-8"?><!--
32
~ Copyright (C) 2017 Luke Klinker
43
~
54
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,18 +16,12 @@
1716

1817
<resources>
1918

20-
<style name="tutorial_FloatingTutorialTheme.Base" parent="@style/Theme.AppCompat.Light.NoActionBar">
19+
<style name="tutorial_FloatingTutorialTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
2120
<item name="colorAccent">@android:color/white</item>
2221
<item name="android:background">@android:color/transparent</item>
2322
<item name="android:windowNoTitle">true</item>
2423
<item name="android:windowBackground">@android:color/transparent</item>
25-
<item name="android:colorBackgroundCacheHint">@null</item>
2624
<item name="android:windowIsTranslucent">true</item>
27-
<item name="android:windowAnimationStyle">@android:style/Animation</item>
28-
</style>
29-
30-
<style name="tutorial_FloatingTutorialTheme" parent="tutorial_FloatingTutorialTheme.Base">
31-
3225
</style>
3326

3427
</resources>

0 commit comments

Comments
 (0)