Skip to content

Update to Android Studio 3.5 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frogermcs merged 9 commits into from
Oct 18, 2019
Merged

Update to Android Studio 3.5 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2c7d0dd
updates dependencies for Android 3.3
frogermcs Feb 20, 2019
478ff3b
update to gradle plugin 3.5.0-alpha11 (gradle should work now - R.txt…
frogermcs Apr 18, 2019
266cfc3
Gradle 3.5.0 alpha 12 with R.txt problem solved
frogermcs Apr 23, 2019
d1a1429
update gradle plugin
frogermcs Oct 18, 2019
200190b
updated Android SDK to API 29
frogermcs Oct 18, 2019
b17b4e6
update travis config
frogermcs Oct 18, 2019
d34d383
accept licence by travis
frogermcs Oct 18, 2019
b7a0f8f
keep updating travis
frogermcs Oct 18, 2019
a5355ec
Travis config update
frogermcs Oct 18, 2019
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
11 changes: 9 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,21 @@ language: android
android:
components:
- build-tools-28.0.3
- android-28
- android-29

- extra-google-m2repository
- extra-android-m2repository
licenses:
- 'android-sdk-preview-license-52d11cd2'
- 'android-sdk-license-.+'
- 'google-gdk-license-.+'

jdk:
- oraclejdk8

before_install:
- yes | sdkmanager "build-tools;28.0.3"

notifications:
email: true

Expand All @@ -19,4 +26,4 @@ cache:
- $HOME/.m2

script:
./gradlew testDebugUnitTest testDebugUnitTestCoverage assembleDebug
./gradlew testDebugUnitTest testDebugUnitTestCoverage assembleDebug
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ buildscript {
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.android.tools.build:gradle:3.5.1'
classpath 'org.jacoco:org.jacoco.core:0.8.1'
classpath 'com.jakewharton:butterknife-gradle-plugin:9.0.0-rc1'
classpath 'com.jakewharton:butterknife-gradle-plugin:10.1.0'
}
}

Expand Down
4 changes: 2 additions & 2 deletions buildsystem/android_commons.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
android {
compileSdkVersion 28
compileSdkVersion 29
defaultConfig {
minSdkVersion 23
targetSdkVersion 28
targetSdkVersion 29
versionCode 1
versionName "1.0"
}
Expand Down
2 changes: 1 addition & 1 deletion buildsystem/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ext {
//Annotation processor dependencies
daggerVersion = '2.14.1'
autoFactoryVersion = '1.0-beta3'
butterknifeVersion = '9.0.0-rc1'
butterknifeVersion = '10.1.0'

//Standard dependencies
supportLibraryVersion = '1.0.0'
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Jul 03 19:11:48 CEST 2018
#Fri Oct 18 11:44:19 CEST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip