Skip to content

Commit 91b4bd9

Browse files
authored
Merge pull request #9 from frogermcs/update_to_AS_3.3
Update to Android Studio 3.5
2 parents 8c5a0a0 + a5355ec commit 91b4bd9

File tree

5 files changed

+16
-9
lines changed

5 files changed

+16
-9
lines changed

.travis.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,21 @@ language: android
33
android:
44
components:
55
- build-tools-28.0.3
6-
- android-28
6+
- android-29
77

88
- extra-google-m2repository
99
- extra-android-m2repository
10+
licenses:
11+
- 'android-sdk-preview-license-52d11cd2'
12+
- 'android-sdk-license-.+'
13+
- 'google-gdk-license-.+'
1014

1115
jdk:
1216
- oraclejdk8
1317

18+
before_install:
19+
- yes | sdkmanager "build-tools;28.0.3"
20+
1421
notifications:
1522
email: true
1623

@@ -19,4 +26,4 @@ cache:
1926
- $HOME/.m2
2027

2128
script:
22-
./gradlew testDebugUnitTest testDebugUnitTestCoverage assembleDebug
29+
./gradlew testDebugUnitTest testDebugUnitTestCoverage assembleDebug

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ buildscript {
66
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:3.2.1'
9+
classpath 'com.android.tools.build:gradle:3.5.1'
1010
classpath 'org.jacoco:org.jacoco.core:0.8.1'
11-
classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0-rc1'
11+
classpath 'com.jakewharton:butterknife-gradle-plugin:10.1.0'
1212
}
1313
}
1414

buildsystem/android_commons.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
android {
2-
compileSdkVersion 28
2+
compileSdkVersion 29
33
defaultConfig {
44
minSdkVersion 23
5-
targetSdkVersion 28
5+
targetSdkVersion 29
66
versionCode 1
77
versionName "1.0"
88
}

buildsystem/dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ext {
66
//Annotation processor dependencies
77
daggerVersion = '2.14.1'
88
autoFactoryVersion = '1.0-beta3'
9-
butterknifeVersion = '9.0.0-rc1'
9+
butterknifeVersion = '10.1.0'
1010

1111
//Standard dependencies
1212
supportLibraryVersion = '1.0.0'
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Jul 03 19:11:48 CEST 2018
1+
#Fri Oct 18 11:44:19 CEST 2019
22
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.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

0 commit comments

Comments
 (0)