Skip to content

Commit

Permalink
[Android] Upgrade androidx.appcompat to 1.2.0 (expo#11018)
Browse files Browse the repository at this point in the history
# Why
Might help resolving: expo#6665
I've failed in reaching the working scenario, but still think this change is worth merging.

# How
Bumped androidx.appcomapat to version 1.2.0

# Test Plan
I was testing on Android simulator running Android 5.1
As I've described in expo#10999 every WebView opened in separate Activity (any managed app) other than the main one (home app) seems to be lacking Internet access. The only URLs working in managed app are either the URL that's already in the device cache or google.com 🤔

No breaking behaviour was observed 😊

# References
androidx.appcompat release notes
stackoverflow.com/questions/58028821/webview-crash-on-android-5-5-1-api-21-22-resourcesnotfoundexception-string-r
https://issuetracker.google.com/issues?q=err_cache_miss
issuetracker.google.com/issues/141351441
  • Loading branch information
bbarthec authored Nov 16, 2020
1 parent 4d35036 commit 58fa52e
Show file tree
Hide file tree
Showing 14 changed files with 20 additions and 13 deletions.
2 changes: 1 addition & 1 deletion android/ReactAndroid/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ dependencies {
api("com.facebook.infer.annotation:infer-annotation:0.11.2")
api("com.facebook.yoga:proguard-annotations:1.14.1")
api("javax.inject:javax.inject:1")
api("androidx.appcompat:appcompat:1.1.0")
api("androidx.appcompat:appcompat:1.2.0")
api("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
api("com.facebook.fresco:fresco:${FRESCO_VERSION}")
api("com.facebook.fresco:imagepipeline-okhttp3:${FRESCO_VERSION}")
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,11 @@ dependencies {
implementation 'androidx.multidex:multidex:2.0.0'

// Our dependencies
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.appcompat:appcompat:1.2.0'

// Our dependencies from ExpoView
// DON'T ADD ANYTHING HERE THAT ISN'T IN EXPOVIEW. ONLY COPY THINGS FROM EXPOVIEW TO HERE.
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation('com.facebook.android:audience-network-sdk:5.1.1') {
exclude module: 'play-services-ads'
}
Expand Down
2 changes: 1 addition & 1 deletion android/expoview/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ dependencies {
api 'javax.inject:javax.inject:1'

// Our dependencies
api "androidx.appcompat:appcompat:1.1.0"
api "androidx.appcompat:appcompat:1.2.0"
compileOnly 'org.glassfish:javax.annotation:3.1.1'
api 'de.greenrobot:eventbus:2.4.0'
api "androidx.room:room-runtime:2.1.0"
Expand Down
2 changes: 1 addition & 1 deletion android/versioned-abis/expoview-abi37_0_0/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ dependencies {
api 'javax.inject:javax.inject:1'

// Our dependencies
api "androidx.appcompat:appcompat:1.1.0"
api "androidx.appcompat:appcompat:1.2.0"
compileOnly 'org.glassfish:javax.annotation:3.1.1'
api 'de.greenrobot:eventbus:2.4.0'

Expand Down
2 changes: 1 addition & 1 deletion android/versioned-abis/expoview-abi38_0_0/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ dependencies {
api 'javax.inject:javax.inject:1'

// Our dependencies
api "androidx.appcompat:appcompat:1.1.0"
api "androidx.appcompat:appcompat:1.2.0"
compileOnly 'org.glassfish:javax.annotation:3.1.1'
api 'de.greenrobot:eventbus:2.4.0'

Expand Down
2 changes: 1 addition & 1 deletion android/versioned-abis/expoview-abi39_0_0/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ dependencies {
api 'javax.inject:javax.inject:1'

// Our dependencies
api "androidx.appcompat:appcompat:1.1.0"
api "androidx.appcompat:appcompat:1.2.0"
compileOnly 'org.glassfish:javax.annotation:3.1.1'
api 'de.greenrobot:eventbus:2.4.0'
api "androidx.room:room-runtime:2.1.0"
Expand Down
2 changes: 2 additions & 0 deletions packages/expo-mail-composer/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

### 🛠 Breaking changes

- Upgrade `androidx.appcompat` to `1.2.0`. ([#11018](https://github.com/expo/expo/pull/11018) by [@bbarthec](https://github.com/bbarthec))

### 🎉 New features

### 🐛 Bug fixes
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-mail-composer/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,5 @@ if (new File(rootProject.projectDir.parentFile, 'package.json').exists()) {
dependencies {
unimodule "unimodules-core"

api "androidx.appcompat:appcompat:1.0.0"
api "androidx.appcompat:appcompat:1.2.0"
}
1 change: 1 addition & 0 deletions packages/expo-permissions/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### 🛠 Breaking changes

- Make background location an opt-in permission on Android. ([#10989](https://github.com/expo/expo/pull/10989) by [@bycedric](https://github.com/bycedric))
- Upgrade `androidx.appcompat` to `1.2.0`. ([#11018](https://github.com/expo/expo/pull/11018) by [@bbarthec](https://github.com/bbarthec))

### 🎉 New features

Expand Down
2 changes: 1 addition & 1 deletion packages/expo-permissions/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ dependencies {
unimodule 'unimodules-permissions-interface'

api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet("kotlinVersion", "1.3.50")}"
api "androidx.appcompat:appcompat:1.0.2"
api "androidx.appcompat:appcompat:1.2.0"

compileOnly('com.facebook.react:react-native:+') {
exclude group: 'com.android.support'
Expand Down
2 changes: 2 additions & 0 deletions packages/expo-screen-capture/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

### 🛠 Breaking changes

- Upgrade `androidx.appcompat` to `1.2.0`. ([#11018](https://github.com/expo/expo/pull/11018) by [@bbarthec](https://github.com/bbarthec))

### 🎉 New features

### 🐛 Bug fixes
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-screen-capture/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,6 @@ repositories {

dependencies {
unimodule 'unimodules-core'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet("kotlinVersion", "1.3.50")}"
}
6 changes: 4 additions & 2 deletions packages/expo-splash-screen/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

### 🛠 Breaking changes

- Upgrade `androidx.appcompat` to `1.2.0`. ([#11018](https://github.com/expo/expo/pull/11018) by [@bbarthec](https://github.com/bbarthec))

### 🎉 New features

### 🐛 Bug fixes
Expand All @@ -18,8 +20,8 @@

- On Android fixed `SplashScreen` methods not working in managed workflow. Scoped the `SplashScreen` native object to the separate `singletons` sub-package to work with versioned code. ([#10294](https://github.com/expo/expo/pull/10294) by [@bbarthec](https://github.com/bbarthec))
- Updated `@expo/configure-splash-screen` to `v0.2.0`.
- this version fixes the problem with the wrong `SplashScreen.show` method singnature on Android. It propoerly adds the `ReactRootView` parameter now.
- additionally it properly imports the `SplashScreen` object from the `singletons` sub-packagae on Android.
- This version fixes the problem with the wrong `SplashScreen.show` method signature on Android. It properly adds the `ReactRootView` parameter now.
- Additionally it properly imports the `SplashScreen` object from the `singletons` sub-packagae on Android.
- `yarn run expo-splash-screen` changed its parameters layout. Run `yarn run expo-splash-screen --help` to see the new options layout. Every parameter has to provided via the `--[option name]` syntax now.

## 0.6.1 - 2020-09-17
Expand Down
2 changes: 1 addition & 1 deletion packages/expo-splash-screen/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ dependencies {

//noinspection GradleDynamicVersion
implementation 'com.facebook.react:react-native:+'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${safeExtGet('kotlinVersion', '1.3.50')}"
implementation "org.jetbrains.kotlin:kotlin-reflect:${safeExtGet('kotlinVersion', '1.3.50')}"
}

0 comments on commit 58fa52e

Please sign in to comment.