Make versions consistent and bump fbjni to 0.3.0 (#458)

- Update fbjni to 0.3.0.
- Update minSdkVersion to 21.
- Update NDK version to 21.4.7075529.
- Update to latest versions for:
  - buildToolsVersion (33.0.0)
  - compileSdkVersion (33)
  - targetSdkVersion (33)
  - gradle maven dependency (7.2.2)
  - gradle distribution (7.3.3)

Author: bghgary

.github/workflows/bn_master_commit.yml

@@ -37,6 +37,8 @@ jobs:
       - name: Gulp (Android)
         run: npx gulp buildAndroid
         working-directory: ./Package
+        env:
+          JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }}
 
   build-iOS:
     name: Build iOS - BabylonNative ${{ github.event.client_payload.sha }}

.github/workflows/ios_android.yml

@@ -9,10 +9,6 @@ on:
       release-version:
         required: true
         type: string
-      java-version:
-        required: false
-        type: string
-        default: '8'
 
 jobs:
   Build:
@@ -26,11 +22,6 @@ jobs:
         uses: jwlawson/[email protected]
         with:
           cmake-version: '3.19.6' # See https://gitlab.kitware.com/cmake/cmake/-/issues/22021
-      - name: Set up JDK
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'zulu'
-          java-version: ${{ inputs.java-version }}        
       - name: Setup Ninja
         run: brew install ninja
       - name: NPM Install (Playground)
@@ -45,6 +36,8 @@ jobs:
       - name: Gulp
         run: npx gulp --reactNative ${{ inputs.react-native-version }} --releaseVersion ${{ inputs.release-version }}
         working-directory: ./Package
+        env:
+          JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }}
       - name: Upload Assembled iOS Android Folder
         uses: actions/upload-artifact@v2
         with:

.github/workflows/pr.yml

@@ -32,6 +32,8 @@ jobs:
       - name: Gulp (Android)
         run: npx gulp buildAndroid
         working-directory: ./Package
+        env:
+          JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }}
 
   build-iOS:
     runs-on: macos-latest
@@ -78,6 +80,8 @@ jobs:
       - name: Gulp
         run: npx gulp
         working-directory: ./Package
+        env:
+          JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }}
 
   build-windows:
     runs-on: windows-2019
@@ -125,14 +129,12 @@ jobs:
   build-android-ios-065:
     uses: ./.github/workflows/ios_android.yml
     with:
-      java-version: '8'
       react-native-version: 0.65
       release-version: 0.0.${GITHUB_SHA::8}
 
   build-android-ios-069:
     uses: ./.github/workflows/ios_android.yml
     with:
-      java-version: '11'
       react-native-version: 0.69
       release-version: 0.0.${GITHUB_SHA::8}
 

.github/workflows/publish.yml

@@ -7,21 +7,18 @@ jobs:
   build-android-ios-064:
     uses: ./.github/workflows/ios_android.yml
     with:
-      java-version: '8'
       react-native-version: 0.64
       release-version: ${GITHUB_REF/refs\/tags\//}
 
   build-android-ios-065:
     uses: ./.github/workflows/ios_android.yml
     with:
-      java-version: '8'
       react-native-version: 0.65
       release-version: ${GITHUB_REF/refs\/tags\//}
 
   build-android-ios-069:
     uses: ./.github/workflows/ios_android.yml
     with:
-      java-version: '11'
       react-native-version: 0.69
       release-version: ${GITHUB_REF/refs\/tags\//}
 

.github/workflows/publish_preview.yml

@@ -17,21 +17,18 @@ jobs:
   build-android-ios-064:
     uses: ./.github/workflows/ios_android.yml
     with:
-      java-version: '8'
       react-native-version: 0.64
       release-version: ${{ github.event.inputs.release_version }}
 
   build-android-ios-065:
     uses: ./.github/workflows/ios_android.yml
     with:
-      java-version: '8'
       react-native-version: 0.65
       release-version: ${{ github.event.inputs.release_version }}
 
   build-android-ios-069:
     uses: ./.github/workflows/ios_android.yml
     with:
-      java-version: '11'
       react-native-version: 0.69
       release-version: ${{ github.event.inputs.release_version }}
 

Apps/PackageTest/0.63.1/android/app/build.gradle

@@ -121,6 +121,8 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 def enableHermes = project.ext.react.get("enableHermes", false);
 
 android {
+    ndkVersion rootProject.ext.ndkVersion
+
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     compileOptions {
@@ -211,7 +213,7 @@ dependencies {
 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {
-    from configurations.compile
+    from configurations.implementation
     into 'libs'
 }
 

Apps/PackageTest/0.63.1/android/app/src/debug/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
     <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
 </manifest>

Apps/PackageTest/0.63.1/android/app/src/main/AndroidManifest.xml

@@ -16,7 +16,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" />

Apps/PackageTest/0.63.1/android/build.gradle

@@ -2,17 +2,18 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "29.0.2"
-        minSdkVersion = 18
-        compileSdkVersion = 29
-        targetSdkVersion = 29
+        buildToolsVersion = "33.0.0"
+        minSdkVersion = 21
+        compileSdkVersion = 33
+        targetSdkVersion = 33
+        ndkVersion = "21.4.7075529"
     }
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.5.4")
+        classpath("com.android.tools.build:gradle:7.2.2")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

Apps/PackageTest/0.63.1/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists