build(deps): native dependencies, rn67 forward port

mikehardy · mikehardy · commit 0d22eadfbb2f · 2021-10-21T18:23:37.000-05:00
diff --git a/packages/analytics/android/build.gradle b/packages/analytics/android/build.gradle
@@ -12,7 +12,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:7.0.0")
+      classpath("com.android.tools.build:gradle:7.0.3")
     }
   }
 }
diff --git a/packages/app-check/android/build.gradle b/packages/app-check/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath('com.android.tools.build:gradle:7.0.0')
+      classpath('com.android.tools.build:gradle:7.0.3')
     }
   }
 }
diff --git a/packages/app-distribution/android/build.gradle b/packages/app-distribution/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:7.0.0")
+      classpath("com.android.tools.build:gradle:7.0.3")
     }
   }
 }
diff --git a/packages/app/android/build.gradle b/packages/app/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:7.0.0")
+      classpath("com.android.tools.build:gradle:7.0.3")
     }
   }
 }
diff --git a/packages/auth/android/build.gradle b/packages/auth/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:7.0.0")
+      classpath("com.android.tools.build:gradle:7.0.3")
     }
   }
 }
diff --git a/packages/crashlytics/android/build.gradle b/packages/crashlytics/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:7.0.0")
+      classpath("com.android.tools.build:gradle:7.0.3")
     }
   }
 }
diff --git a/packages/database/android/build.gradle b/packages/database/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:7.0.0")
+      classpath("com.android.tools.build:gradle:7.0.3")
     }
   }
 }
diff --git a/packages/dynamic-links/android/build.gradle b/packages/dynamic-links/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:7.0.0")
+      classpath("com.android.tools.build:gradle:7.0.3")
     }
   }
 }
diff --git a/packages/firestore/android/build.gradle b/packages/firestore/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:7.0.0")
+      classpath("com.android.tools.build:gradle:7.0.3")
     }
   }
 }
diff --git a/packages/functions/android/build.gradle b/packages/functions/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:7.0.0")
+      classpath("com.android.tools.build:gradle:7.0.3")
     }
   }
 }
diff --git a/packages/in-app-messaging/android/build.gradle b/packages/in-app-messaging/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:7.0.0")
+      classpath("com.android.tools.build:gradle:7.0.3")
     }
   }
 }
diff --git a/packages/installations/android/build.gradle b/packages/installations/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:7.0.0")
+      classpath("com.android.tools.build:gradle:7.0.3")
     }
   }
 }
diff --git a/packages/messaging/android/build.gradle b/packages/messaging/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:7.0.0")
+      classpath("com.android.tools.build:gradle:7.0.3")
     }
   }
 }
diff --git a/packages/ml/android/build.gradle b/packages/ml/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:7.0.0")
+      classpath("com.android.tools.build:gradle:7.0.3")
     }
   }
 }
diff --git a/packages/perf/android/build.gradle b/packages/perf/android/build.gradle
@@ -12,7 +12,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:7.0.0")
+      classpath("com.android.tools.build:gradle:7.0.3")
     }
   }
 }
diff --git a/packages/remote-config/android/build.gradle b/packages/remote-config/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:7.0.0")
+      classpath("com.android.tools.build:gradle:7.0.3")
     }
   }
 }
diff --git a/packages/storage/android/build.gradle b/packages/storage/android/build.gradle
@@ -11,7 +11,7 @@ buildscript {
     }
 
     dependencies {
-      classpath("com.android.tools.build:gradle:7.0.0")
+      classpath("com.android.tools.build:gradle:7.0.3")
     }
   }
 }
diff --git a/tests/Gemfile b/tests/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
+ruby '2.6.3'
+gem 'cocoapods', '~> 1.11', '>= 1.11.2'
diff --git a/tests/Gemfile.lock b/tests/Gemfile.lock
@@ -0,0 +1,96 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.4)
+      rexml
+    activesupport (6.1.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    algoliasearch (1.27.5)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    atomos (0.1.3)
+    claide (1.0.3)
+    cocoapods (1.11.2)
+      addressable (~> 2.8)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.11.2)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.4.0, < 2.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.8.0)
+      nap (~> 1.0)
+      ruby-macho (>= 1.0, < 3.0)
+      xcodeproj (>= 1.21.0, < 2.0)
+    cocoapods-core (1.11.2)
+      activesupport (>= 5.0, < 7)
+      addressable (~> 2.8)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+      netrc (~> 0.11)
+      public_suffix (~> 4.0)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-downloader (1.5.1)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.1)
+    cocoapods-trunk (1.6.0)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.2.0)
+    colored2 (3.1.2)
+    concurrent-ruby (1.1.9)
+    escape (0.0.4)
+    ethon (0.15.0)
+      ffi (>= 1.15.0)
+    ffi (1.15.4)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
+    gh_inspector (1.1.3)
+    httpclient (2.8.3)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    json (2.6.0)
+    minitest (5.14.4)
+    molinillo (0.8.0)
+    nanaimo (0.3.0)
+    nap (1.1.0)
+    netrc (0.11.0)
+    public_suffix (4.0.6)
+    rexml (3.2.5)
+    ruby-macho (2.5.1)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    xcodeproj (1.21.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
+    zeitwerk (2.4.2)
+PLATFORMS
+  ruby
+DEPENDENCIES
+  cocoapods (~> 1.11, >= 1.11.2)
+RUBY VERSION
+   ruby 2.6.3p62
+BUNDLED WITH
+   1.17.2
diff --git a/tests/_bundle/config b/tests/_bundle/config
@@ -0,0 +1,2 @@
+BUNDLE_PATH: "vendor/bundle"
+BUNDLE_FORCE_RUBY_PLATFORM: 1
diff --git a/tests/_ruby-version b/tests/_ruby-version
@@ -0,0 +1 @@
+2.6.3
diff --git a/tests/android/app/src/main/res/drawable/rn_edit_text_material.xml b/tests/android/app/src/main/res/drawable/rn_edit_text_material.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+          http://www.apache.org/licenses/LICENSE-2.0
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+       android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
+       android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
+       android:insetTop="@dimen/abc_edit_text_inset_top_material"
+       android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">
+    <selector>
+        <!-- 
+          This file is a copy of abc_edit_text_material (https://bit.ly/3k8fX7I).
+          The item below with state_pressed="false" and state_focused="false" causes a NullPointerException.
+          NullPointerException:tempt to invoke virtual method 'android.graphics.drawable.Drawable android.graphics.drawable.Drawable$ConstantState.newDrawable(android.content.res.Resources)'
+          <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
+          For more info, see https://bit.ly/3CdLStv (react-native/pull/29452) and https://bit.ly/3nxOMoR.
+        -->
+        <item android:state_enabled="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
+        <item android:drawable="@drawable/abc_textfield_activated_mtrl_alpha"/>
+    </selector>
+</inset>
diff --git a/tests/android/app/src/main/res/values/styles.xml b/tests/android/app/src/main/res/values/styles.xml
@@ -3,6 +3,7 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
+        <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
     </style>
 
 </resources>
diff --git a/tests/android/build.gradle b/tests/android/build.gradle
@@ -5,21 +5,21 @@ buildscript {
   ext.targetSdkVersion = 30
   ext.ndkVersion = '21.4.7075529'
 
-  ext.kotlinVersion = '1.5.21' // https://kotlinlang.org/releases.html
+  ext.kotlinVersion = '1.5.31' // https://kotlinlang.org/releases.html
   ext.supportLibVersion = '1.6.0' // this maps to androidx.core https://developer.android.com/jetpack/androidx/releases/core
   ext.appCompatVersion = '1.3.1' // this maps to androidx.appcompat https://developer.android.com/jetpack/androidx/releases/appcompat
   ext.supportVersion = ext.supportLibVersion
   //noinspection GradleDependency  https://github.com/facebook/react-native/pull/30061
   // We will be able to bump to 2.3.0 with react-native 0.65.0+, fresco 2.4.0 is out maybe possible
-  ext.frescoVersion = '2.2.0' // https://github.com/facebook/fresco/releases
+  ext.frescoVersion = '2.6.0' // https://github.com/facebook/fresco/releases
   ext.fragmentVersion = '1.3.6' // https://developer.android.com/jetpack/androidx/releases/fragment
   ext.vectordrawableVersion = '1.1.0' // https://developer.android.com/jetpack/androidx/releases/vectordrawable
   ext.androidxAnnotationVersion = '1.2.0' // https://developer.android.com/jetpack/androidx/releases/annotation
   ext.googlePlayServicesLocationVersion = '18.0.0' // https://developers.google.com/android/guides/setup
   ext.googlePlayServicesVersion = '17.6.0' // play-services-base
   ext.googlePlayServicesAuthVersion = '19.2.0' // play-services-auth
   ext.googlePlayServicesVisionVersion = '20.1.3' // play-services-vision
-  ext.mediaCompatVersion = '1.4.0' // https://developer.android.com/jetpack/androidx/releases/media
+  ext.mediaCompatVersion = '1.4.3' // https://developer.android.com/jetpack/androidx/releases/media
   ext.supportV4Version = '1.0.0' // https://developer.android.com/jetpack/androidx/releases/legacy androidx.legacy:legacy-support-v4
   ext.swiperefreshlayoutVersion = '1.1.0' // https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout
 
@@ -32,7 +32,7 @@ buildscript {
   }
   dependencies {
     classpath 'com.google.gms:google-services:4.3.10' // https://developers.google.com/android/guides/google-services-plugin
-    classpath 'com.android.tools.build:gradle:7.0.2'
+    classpath 'com.android.tools.build:gradle:7.0.3'
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     classpath 'com.google.firebase:perf-plugin:1.4.0'
     classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
@@ -44,7 +44,6 @@ allprojects {
   println "${project.name} ${projectDir} ${rootDir}"
 
   repositories {
-    mavenLocal()
     maven {
       // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
       url("$rootDir/../node_modules/react-native/android")
@@ -57,8 +56,15 @@ allprojects {
     //   // Detox as an .aar file (we're going to use it as a compile dependency though, to patch it)
     //   url "$rootDir/../node_modules/detox/Detox-android"
     // }
+    mavenCentral {
+      // We don't want to fetch react-native from Maven Central as there are
+      // older versions over there.
+      content {
+        excludeGroup "com.facebook.react"
+      }
+    }
     google()
-    mavenCentral()
+    maven { url 'https://www.jitpack.io' }
   }
 }
 
diff --git a/tests/ios/Podfile b/tests/ios/Podfile
@@ -56,8 +56,5 @@ target 'testing' do
       end
       aggregate_target.user_project.save
     end
-
-    # This is needed until react-native gets transitive dependencies fixed
-    __apply_Xcode_12_5_M1_post_install_workaround(installer)
   end
 end
diff --git a/tests/ios/Podfile.lock b/tests/ios/Podfile.lock
diff --git a/tests/ios/testing.xcodeproj/project.pbxproj b/tests/ios/testing.xcodeproj/project.pbxproj

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ buildscript {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`dependencies {`
`15`		`- classpath("com.android.tools.build:gradle:7.0.0")`
	`15`	`+ classpath("com.android.tools.build:gradle:7.0.3")`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ buildscript {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`dependencies {`
`14`		`- classpath('com.android.tools.build:gradle:7.0.0')`
	`14`	`+ classpath('com.android.tools.build:gradle:7.0.3')`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`}`