diff --git a/android/app/build.gradle b/android/app/build.gradle index 9c991dfe8..6ed19c37c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -133,6 +133,11 @@ android { targetCompatibility JavaVersion.VERSION_1_8 } + lintOptions { + checkReleaseBuilds false + abortOnError false + } + packagingOptions { pickFirst '**/libc++_shared.so' } @@ -141,7 +146,6 @@ android { applicationId "com.mattermost.rnbeta" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60" versionCode 333 versionName "2.0.0" testBuildType System.getProperty('testBuildType', 'debug') diff --git a/fastlane/Gemfile.lock b/fastlane/Gemfile.lock index 5f28d038b..88352ad8e 100644 --- a/fastlane/Gemfile.lock +++ b/fastlane/Gemfile.lock @@ -1,24 +1,24 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.4) + CFPropertyList (3.0.5) rexml addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.510.0) - aws-sdk-core (3.121.1) + aws-partitions (1.540.0) + aws-sdk-core (3.124.0) aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) + aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.49.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-kms (1.52.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.103.0) - aws-sdk-core (~> 3, >= 3.120.0) + aws-sdk-s3 (1.109.0) + aws-sdk-core (~> 3, >= 3.122.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) aws-sigv4 (1.4.0) @@ -36,7 +36,7 @@ GEM unf (>= 0.0.5, < 1.0.0) dotenv (2.7.6) emoji_regex (3.2.3) - excon (0.86.0) + excon (0.89.0) faraday (1.8.0) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) @@ -59,10 +59,10 @@ GEM faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) - faraday_middleware (1.1.0) + faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.5) - fastlane (2.195.0) + fastlane (2.199.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -107,7 +107,7 @@ GEM fastlane-plugin-find_replace_string (0.1.0) fastlane-plugin-versioning_android (0.1.0) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.11.0) + google-apis-androidpublisher_v3 (0.14.0) google-apis-core (>= 0.4, < 2.a) google-apis-core (0.4.1) addressable (~> 2.5, >= 2.5.1) @@ -118,11 +118,11 @@ GEM retriable (>= 2.0, < 4.a) rexml webrick - google-apis-iamcredentials_v1 (0.7.0) + google-apis-iamcredentials_v1 (0.8.0) google-apis-core (>= 0.4, < 2.a) - google-apis-playcustomapp_v1 (0.5.0) + google-apis-playcustomapp_v1 (0.6.0) google-apis-core (>= 0.4, < 2.a) - google-apis-storage_v1 (0.8.0) + google-apis-storage_v1 (0.10.0) google-apis-core (>= 0.4, < 2.a) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) @@ -130,15 +130,15 @@ GEM google-cloud-env (1.5.0) faraday (>= 0.17.3, < 2.0) google-cloud-errors (1.2.0) - google-cloud-storage (1.34.1) - addressable (~> 2.5) + google-cloud-storage (1.35.0) + addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) google-apis-storage_v1 (~> 0.1) google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.0.0) + googleauth (1.1.0) faraday (>= 0.17.3, < 2.0) jwt (>= 1.4, < 3.0) memoist (~> 0.16) @@ -150,11 +150,11 @@ GEM domain_name (~> 0.5) httpclient (2.8.3) jmespath (1.4.0) - json (2.5.1) + json (2.6.1) jwt (2.3.0) memoist (0.16.2) mini_magick (4.11.0) - mini_mime (1.1.1) + mini_mime (1.1.2) mini_portile2 (2.6.1) multi_json (1.15.0) multipart-post (2.0.0) @@ -164,10 +164,10 @@ GEM mini_portile2 (~> 2.6.1) racc (~> 1.4) optparse (0.1.1) - os (1.1.1) + os (1.1.4) plist (3.6.0) public_suffix (4.0.6) - racc (1.5.2) + racc (1.6.0) rake (13.0.6) representable (3.1.1) declarative (< 0.1.0) @@ -191,7 +191,7 @@ GEM terminal-notifier (2.0.0) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) - trailblazer-option (0.1.1) + trailblazer-option (0.1.2) tty-cursor (0.7.1) tty-screen (0.8.1) tty-spinner (0.9.3) diff --git a/patches/react-native-reanimated+2.3.0.patch b/patches/react-native-reanimated+2.3.0.patch new file mode 100644 index 000000000..d5a6a45b2 --- /dev/null +++ b/patches/react-native-reanimated+2.3.0.patch @@ -0,0 +1,29 @@ +diff --git a/node_modules/react-native-reanimated/android/expo/linking.gradle b/node_modules/react-native-reanimated/android/expo/linking.gradle +index 3a583a6..81ae08b 100644 +--- a/node_modules/react-native-reanimated/android/expo/linking.gradle ++++ b/node_modules/react-native-reanimated/android/expo/linking.gradle +@@ -15,12 +15,24 @@ if (isExpoLinked) { + apply plugin: 'com.android.library' + + android { ++ // Disable aar bundling to fix the error when running `gradle assembleRelease` over `gradle :app:assembleRelease` ++ // which will throw `Direct local .aar file dependencies are not supported when building an AAR.` ++ tasks.whenTaskAdded { task -> ++ if (['bundleDebugAar', 'bundleReleaseAar'].contains(task.name)) { ++ task.enabled = false ++ } ++ } ++ + compileSdkVersion safeExtGet('compileSdkVersion', 30) + + sourceSets { + main.manifest.srcFile 'src/AndroidManifest.xml' + main.java.srcDirs = [ 'expo/src/main/java' ] + } ++ ++ libraryVariants.all { ++ generateBuildConfigProvider?.get()?.enabled = false ++ } + } + + dependencies {