Skip to content
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.

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

Change build/target SDK ver (26->28), min SDK ver (15->16), and other dependency versions. #232

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open
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: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ android:
components:
- platform-tools
- tools
- build-tools-26.0.2
- android-26
- build-tools-28.0.3
- android-28
- extra-android-m2repository
- extra-google-google_play_services
- sys-img-armeabi-v7a-android-26
- sys-img-armeabi-v7a-android-28
42 changes: 24 additions & 18 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ android {
lintOptions {
abortOnError false
}
compileSdkVersion 26
buildToolsVersion '26.0.2'
compileSdkVersion 28
buildToolsVersion '28.0.3'
defaultConfig {
applicationId "com.google.android.kk"
minSdkVersion 15
targetSdkVersion 26
minSdkVersion 16
targetSdkVersion 28
versionCode 38
versionName "2.0.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -41,38 +41,44 @@ android {
sourceCompatibility 1.8
targetCompatibility 1.8
}
dexOptions {
// This workaround exists to mitigate an error that can be encountered when
// generating a signed APK:
// com.android.dex.DexException: Cannot merge new index 65536 into a non-jumbo instruction!
jumboMode = true
}
}

buildscript {
repositories {
jcenter()
}
dependencies {
classpath "io.realm:realm-gradle-plugin:4.3.3"
classpath "io.realm:realm-gradle-plugin:5.11.0"
}
}


dependencies {
implementation 'com.google.firebase:firebase-core:11.0.4'
implementation 'com.google.firebase:firebase-messaging:11.0.4'
implementation 'com.google.firebase:firebase-crash:11.0.4'
implementation 'com.android.support:support-v4:26.1.0'
implementation 'com.google.firebase:firebase-core:16.0.9'
implementation 'com.google.firebase:firebase-messaging:18.0.0'
implementation 'com.google.firebase:firebase-crash:16.2.1'
implementation 'com.android.support:support-v4:28.0.0'
compile fileTree(include: ['*.jar'], dir: 'libs')
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
androidTestCompile('com.android.support.test.espresso:espresso-core:3.0.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support:cardview-v7:26.1.0'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'com.android.support:design:26.1.0'
compile 'com.android.support:appcompat-v7:28.0.0'
compile 'com.android.support:cardview-v7:28.0.0'
compile 'com.android.support.constraint:constraint-layout:2.0.0-beta1'
compile 'com.android.support:design:28.0.0'
compile 'com.github.martoreto:aauto-sdk:v4.5'
compile 'com.github.zagum:SpeechRecognitionView:1.2.2'
testCompile 'junit:junit:4.12'
compile 'com.squareup.okhttp3:okhttp:3.9.1'
testCompile 'junit:junit:4.13-beta-3'
compile 'com.squareup.okhttp3:okhttp:4.0.0-alpha01'
compile 'com.squareup.okio:okio:2.2.2' // Needed as dependency for okhttp3
compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support:recyclerview-v7:26.1.0'
compile 'com.android.support:appcompat-v7:28.0.0'
compile 'com.android.support:recyclerview-v7:28.0.0'
compile 'com.google.android.exoplayer:exoplayer:2.6.1'
compile 'com.github.javiersantos:AppUpdater:2.6.4'
compile 'eu.chainfire:libsuperuser:1.0.0.+'
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
classpath 'com.android.tools.build:gradle:3.0.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath 'com.google.gms:google-services:3.1.0'
classpath 'com.google.gms:google-services:4.2.0'
}
}

Expand Down