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

[RNMobile] Upgrade compile and target sdk version to Android API 31 #44610

Merged
merged 11 commits into from
Oct 13, 2022
Merged

[RNMobile] Upgrade compile and target sdk version to Android API 31 #44610

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a3dea09
Upgrade compile and target sdk version to API 31
fluiddot Sep 30, 2022
958300d
Enable component exporting for demo activity
fluiddot Sep 30, 2022
de1fc70
[TEST] Point Android dependencies to snapshot version
fluiddot Oct 4, 2022
aca0984
[TEST] Point react-native-aztec Android dependencies to SHA commits
fluiddot Oct 4, 2022
21df09d
Bump Android build tools version to 31
fluiddot Oct 5, 2022
fdc7cc8
Fix extra space on Aztec views
fluiddot Oct 7, 2022
9e836f9
Update react-native-editor changelog
fluiddot Oct 7, 2022
6ce605b
Update Aztec version to 1.6.2
fluiddot Oct 13, 2022
3b3faa5
Revert: Point Android dependencies to snapshot version
fluiddot Oct 13, 2022
4a8664d
Bump react-native-editor dependencies from forked repos
fluiddot Oct 13, 2022
0e18084
Revert updating wordpressUtilsVersion
fluiddot Oct 13, 2022
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
8 changes: 4 additions & 4 deletions packages/react-native-aztec/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ buildscript {
robolectricVersion = '3.5.1'
jUnitVersion = '4.12'
jSoupVersion = '1.10.3'
wordpressUtilsVersion = '2.3.0'
wordpressUtilsVersion = '110-13b4f06680ed8c145cbd09d63c4998dfe8b3b9de'
espressoVersion = '3.0.1'
aztecVersion = 'v1.6.0'
aztecVersion = '1006-3fdbbc2086fb71d3750b01c013fa5cf6024c3142'
fluiddot marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand All @@ -34,11 +34,11 @@ List<String> dirs = [
'template'] // boilerplate code that is generated by the sample template process

android {
compileSdkVersion 30
compileSdkVersion 31

defaultConfig {
minSdkVersion 21
targetSdkVersion 30
targetSdkVersion 31
}

compileOptions {
Expand Down
16 changes: 8 additions & 8 deletions packages/react-native-bridge/android/react-native-bridge/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ group='org.wordpress-mobile.gutenberg-mobile'
def buildAssetsFolder = 'build/assets'

android {
compileSdkVersion 30
compileSdkVersion 31

defaultConfig {
minSdkVersion 21
targetSdkVersion 30
targetSdkVersion 31
buildConfigField "boolean", "SHOULD_ATTACH_JS_BUNDLE", willPublishReactNativeBridgeBinary.toString()
}

Expand Down Expand Up @@ -65,20 +65,20 @@ dependencies {

implementation "com.facebook.react:react-native:$rnVersion"
implementation "org.wordpress-mobile:react-native-svg:${extractPackageVersion(packageJson, 'react-native-svg', 'dependencies')}"
implementation "com.github.wordpress-mobile:react-native-video:${extractPackageVersion(packageJson, 'react-native-video', 'dependencies')}"
implementation "com.github.wordpress-mobile:react-native-linear-gradient:${extractPackageVersion(packageJson, 'react-native-linear-gradient', 'dependencies')}"
implementation "com.github.wordpress-mobile:react-native-slider:${extractPackageVersion(packageJson, '@react-native-community/slider', 'dependencies')}"
implementation "com.github.wordpress-mobile:react-native-video:update~android-12-SNAPSHOT"
implementation "com.github.wordpress-mobile:react-native-linear-gradient:update~android-12-SNAPSHOT"
implementation "com.github.wordpress-mobile:react-native-slider:update~android-12-SNAPSHOT"
implementation "org.wordpress-mobile:react-native-get-random-values:${extractPackageVersion(packageJson, 'react-native-get-random-values', 'dependencies')}"
implementation "org.wordpress-mobile:react-native-masked-view:${extractPackageVersion(packageJson, '@react-native-masked-view/masked-view', 'dependencies')}"
implementation "org.wordpress-mobile:react-native-screens:${extractPackageVersion(packageJson, 'react-native-screens', 'dependencies')}"
implementation "org.wordpress-mobile:react-native-safe-area-context:${extractPackageVersion(packageJson, 'react-native-safe-area-context', 'dependencies')}"
implementation "com.github.wordpress-mobile:react-native-reanimated:${extractPackageVersion(packageJson, 'react-native-reanimated', 'dependencies')}"
implementation "com.github.wordpress-mobile:react-native-prompt-android:${extractPackageVersion(packageJson, 'react-native-prompt-android', 'dependencies')}"
implementation "com.github.wordpress-mobile:react-native-reanimated:update~android-12-1.9.0-g0ae9a17"
implementation "com.github.wordpress-mobile:react-native-prompt-android:update~android-12-SNAPSHOT"
implementation "org.wordpress-mobile:react-native-webview:${extractPackageVersion(packageJson, 'react-native-webview', 'dependencies')}"
implementation "org.wordpress-mobile:react-native-clipboard:${extractPackageVersion(packageJson, '@react-native-clipboard/clipboard', 'dependencies')}"
implementation "org.wordpress-mobile:react-native-fast-image:${extractPackageVersion(packageJson, 'react-native-fast-image', 'dependencies')}"

implementation("com.github.wordpress-mobile:react-native-gesture-handler:${extractPackageVersion(packageJson, 'react-native-gesture-handler', 'dependencies')}", {
implementation("com.github.wordpress-mobile:react-native-gesture-handler:update~android-12-SNAPSHOT", {
fluiddot marked this conversation as resolved.
Show resolved Hide resolved
// Remove Reanimated transitive dependency as it's already defined here
exclude group: 'com.github.wordpress-mobile', module: 'react-native-reanimated'
})
Expand Down
12 changes: 6 additions & 6 deletions packages/react-native-editor/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,20 +182,20 @@ dependencies {
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"

implementation "org.wordpress-mobile:react-native-svg:${extractPackageVersion(packageJson, 'react-native-svg', 'dependencies')}"
implementation "com.github.wordpress-mobile:react-native-video:${extractPackageVersion(packageJson, 'react-native-video', 'dependencies')}"
implementation "com.github.wordpress-mobile:react-native-linear-gradient:${extractPackageVersion(packageJson, 'react-native-linear-gradient', 'dependencies')}"
implementation "com.github.wordpress-mobile:react-native-slider:${extractPackageVersion(packageJson, '@react-native-community/slider', 'dependencies')}"
implementation "com.github.wordpress-mobile:react-native-video:update~android-12-SNAPSHOT"
implementation "com.github.wordpress-mobile:react-native-linear-gradient:update~android-12-SNAPSHOT"
implementation "com.github.wordpress-mobile:react-native-slider:update~android-12-SNAPSHOT"
implementation "org.wordpress-mobile:react-native-get-random-values:${extractPackageVersion(packageJson, 'react-native-get-random-values', 'dependencies')}"
implementation "org.wordpress-mobile:react-native-masked-view:${extractPackageVersion(packageJson, '@react-native-masked-view/masked-view', 'dependencies')}"
implementation "org.wordpress-mobile:react-native-screens:${extractPackageVersion(packageJson, 'react-native-screens', 'dependencies')}"
implementation "org.wordpress-mobile:react-native-safe-area-context:${extractPackageVersion(packageJson, 'react-native-safe-area-context', 'dependencies')}"
implementation "com.github.wordpress-mobile:react-native-reanimated:${extractPackageVersion(packageJson, 'react-native-reanimated', 'dependencies')}"
implementation "com.github.wordpress-mobile:react-native-prompt-android:${extractPackageVersion(packageJson, 'react-native-prompt-android', 'dependencies')}"
implementation "com.github.wordpress-mobile:react-native-reanimated:update~android-12-1.9.0-g0ae9a17"
implementation "com.github.wordpress-mobile:react-native-prompt-android:update~android-12-SNAPSHOT"
implementation "org.wordpress-mobile:react-native-webview:${extractPackageVersion(packageJson, 'react-native-webview', 'dependencies')}"
implementation "org.wordpress-mobile:react-native-clipboard:${extractPackageVersion(packageJson, '@react-native-clipboard/clipboard', 'dependencies')}"
implementation "org.wordpress-mobile:react-native-fast-image:${extractPackageVersion(packageJson, 'react-native-fast-image', 'dependencies')}"

implementation("com.github.wordpress-mobile:react-native-gesture-handler:${extractPackageVersion(packageJson, 'react-native-gesture-handler', 'dependencies')}", {
implementation("com.github.wordpress-mobile:react-native-gesture-handler:update~android-12-SNAPSHOT", {
// Remove Reanimated transitive dependency as it's already defined here
exclude group: 'com.github.wordpress-mobile', module: 'react-native-reanimated'
})
Expand Down
3 changes: 2 additions & 1 deletion packages/react-native-editor/android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
android:label="@string/app_name"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
android:launchMode="singleTask"
android:windowSoftInputMode="adjustResize">
android:windowSoftInputMode="adjustResize"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand Down
4 changes: 2 additions & 2 deletions packages/react-native-editor/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ buildscript {
kotlinVersion = '1.5.32'
buildToolsVersion = "30.0.2"
minSdkVersion = 21
compileSdkVersion = 30
targetSdkVersion = 30
compileSdkVersion = 31
targetSdkVersion = 31
supportLibVersion = '28.0.0'
ndkVersion = "21.4.7075529"
}
Expand Down