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.

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

Jump to bottom

[android] Bump compileSdkVersion to 29 #8450

Merged
merged 5 commits into from May 25, 2020
Merged

[android] Bump compileSdkVersion to 29 #8450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5cb8450
[android] Bump targetSdkVersion and compileSdkVersion to 29
tsapeta May 22, 2020
b76df22
[bare-expo] Bump targetSdkVersion and compileSdkVersion to 29
tsapeta May 24, 2020
a559666
[android] Fix casing of `compileSdkVersion`
tsapeta May 25, 2020
b5ea43e
[android] Bump only compileSdkVersion
tsapeta May 25, 2020
14e8836
Apply suggestions from code review
tsapeta May 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/app/build.gradle
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ def safeExtGet(prop, fallback) {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand Down
6 changes: 3 additions & 3 deletions android/build.gradle
View file
Open in desktop
Expand Up @@ -4,11 +4,11 @@ buildscript {
ext {
minSdkVersion = 21
targetSdkVersion = 28
compileSdkVersion = 28
compileSdkVersion = 29

dbFlowVersion = '4.2.4'
buildToolsVersion = '28.0.0'
supportLibVersion = '28.0.0'
buildToolsVersion = '29.0.2'
supportLibVersion = '29.0.0'
kotlinVersion = '1.3.50'
gradlePluginVersion = '3.5.3'
gradleDownloadTaskVersion = '3.4.3'
Expand Down
2 changes: 1 addition & 1 deletion android/expoview/build.gradle
View file
Open in desktop
Expand Up @@ -65,7 +65,7 @@ repositories {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

compileOptions {
sourceCompatibility = '1.8'
Expand Down
2 changes: 1 addition & 1 deletion android/versioned-abis/expoview-abi35_0_0/build.gradle
View file
Open in desktop
Expand Up @@ -25,7 +25,7 @@ repositories {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

compileOptions {
sourceCompatibility = '1.8'
Expand Down
2 changes: 1 addition & 1 deletion android/versioned-abis/expoview-abi36_0_0/build.gradle
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@ repositories {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

compileOptions {
sourceCompatibility = '1.8'
Expand Down
2 changes: 1 addition & 1 deletion android/versioned-abis/expoview-abi37_0_0/build.gradle
View file
Open in desktop
Expand Up @@ -31,7 +31,7 @@ repositories {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

compileOptions {
sourceCompatibility = '1.8'
Expand Down
7 changes: 3 additions & 4 deletions apps/bare-expo/android/build.gradle
View file
Open in desktop
Expand Up @@ -4,13 +4,13 @@ import groovy.json.JsonSlurper

buildscript {
ext {
buildToolsVersion = "28.0.3"
buildToolsVersion = "29.0.2"
gradlePluginVersion = "3.5.3"
minSdkVersion = 21
compileSdkVersion = 28
compileSdkVersion = 29
targetSdkVersion = 28
// Some dependencies still expect supportLibVersion to be defined
supportLibVersion = "28.0.0"
supportLibVersion = "29.0.0"
kotlinVersion = '1.3.50'
}
repositories {
Expand Down Expand Up @@ -62,4 +62,3 @@ allprojects {
maven { url 'https://jitpack.io' }
}
}

2 changes: 1 addition & 1 deletion packages/@unimodules/core/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/@unimodules/react-native-adapter/android/build.gradle
View file
Open in desktop
Expand Up @@ -52,7 +52,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-ads-admob/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-ads-facebook/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-analytics-amplitude/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-analytics-segment/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-app-auth/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-application/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
4 changes: 2 additions & 2 deletions packages/expo-av/android/build.gradle
View file
Open in desktop
Expand Up @@ -46,7 +46,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down Expand Up @@ -92,7 +92,7 @@ dependencies {
api "com.squareup.okhttp3:okhttp:3.10.0"
api "com.squareup.okhttp3:okhttp-urlconnection:3.10.0"

api "com.android.support:support-annotations:${safeExtGet("supportLibVersion", "28.0.0")}"
api "com.android.support:support-annotations:${safeExtGet("supportLibVersion", "29.0.0")}"

testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.1'
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.5.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-background-fetch/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-barcode-scanner/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-battery/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-branch/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-brightness/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-calendar/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-camera/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-cellular/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-constants/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-contacts/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-crypto/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-device/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-document-picker/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-error-recovery/android/build.gradle
View file
Open in desktop
Expand Up @@ -46,7 +46,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-face-detector/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-facebook/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-file-system/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-firebase-analytics/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-firebase-core/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-font/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-gl-cpp/android/build.gradle
View file
Open in desktop
Expand Up @@ -172,7 +172,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-gl/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-google-sign-in/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-haptics/android/build.gradle
View file
Open in desktop
Expand Up @@ -35,7 +35,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-image-loader/android/build.gradle
View file
Open in desktop
Expand Up @@ -46,7 +46,7 @@ uploadArchives {
}

android {
compileSdkVersion safeExtGet("compileSdkVersion", 28)
compileSdkVersion safeExtGet("compileSdkVersion", 29)

defaultConfig {
minSdkVersion safeExtGet("minSdkVersion", 21)
Expand Down