Merge branch 'master' into bugfix/Fix-expo-config

dotintent · Oct 27, 2023 · 50ff599 · 50ff599
2 parents 885a70e + e94ae41
commit 50ff599
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/.github/actions/setup_test_project/action.yml b/.github/actions/setup_test_project/action.yml
@@ -32,7 +32,7 @@ runs:
           ${{ runner.os }}-${{ inputs.REACT_NATIVE_VERSION }}-yarn-
 
     - name: Copy project files
-      run: node ./scripts/copyExampleProjectFiles.js
+      run: REACT_NATIVE_VERSION=${{ inputs.REACT_NATIVE_VERSION }} node ./scripts/copyExampleProjectFiles.js
       shell: bash
 
     - name: Install dependencies

diff --git a/scripts/copyExampleProjectFiles.js b/scripts/copyExampleProjectFiles.js
@@ -119,12 +119,14 @@ const changePackageJsonName = () => {
   fs.writeFileSync(packageJsonDestinationPath, JSON.stringify(packageJson, null, 2) + '\n')
 }
 
-const setMinSdkVersion = () => {
-  const gradlePath = path.join(__dirname, TEST_PROJECT_DIR_NAME, 'android', 'app', 'build.gradle')
-  const gradleLines = fs.readFileSync(gradlePath, 'utf8').split('\n')
-  const indexOfManifestTagEndLine = gradleLines.findIndex(line => line.includes('minSdkVersion'))
-  gradleLines[indexOfManifestTagEndLine] = 'minSdkVersion 23'
-  fs.writeFileSync(gradlePath, gradleLines.join('\n'))
+const setCompileSdkVersion = () => {
+  if (process.env.REACT_NATIVE_VERSION.includes('0.70')) {
+    const gradlePath = path.join(__dirname, TEST_PROJECT_DIR_NAME, 'android', 'app', 'build.gradle')
+    const gradleLines = fs.readFileSync(gradlePath, 'utf8').split('\n')
+    const indexOfManifestTagEndLine = gradleLines.findIndex(line => line.includes('compileSdkVersion'))
+    gradleLines[indexOfManifestTagEndLine] = 'compileSdkVersion 32'
+    fs.writeFileSync(gradlePath, gradleLines.join('\n'))
+  }
 }
 
 const copyExampleProjectFiles = () => {
@@ -136,7 +138,7 @@ const copyExampleProjectFiles = () => {
   copyReactNativeConfig()
   copyBabelConfig()
   changePackageJsonName()
-  setMinSdkVersion()
+  setCompileSdkVersion()
 }
 
 copyExampleProjectFiles()