RN 0.68 compat (#338)

.gitignore

@@ -60,8 +60,9 @@ buck-out/
 # Bundle artifact
 *.jsbundle
 
-# CocoaPods
-Pods/
+# Ruby / CocoaPods
+example/ios/Pods/
+example/vendor/bundle/
 
 # Bob
 dist/

MIGRATION.md

@@ -11,12 +11,14 @@
 
 ## Code modifications
 
+ℹ️ For `react-native` < `0.68` migration guide, check the [`v4.1.3 README.md`](https://github.com/zoontek/react-native-bootsplash/blob/4.1.3/MIGRATION.md)
+
 For `android/build.gradle`:
 
 ```diff
 buildscript {
   ext {
--   buildToolsVersion = "30.0.2"
+-   buildToolsVersion = "31.0.0"
 -   minSdkVersion = 21
 -   compileSdkVersion = 30
 -   targetSdkVersion = 30
@@ -36,10 +38,9 @@ For `android/app/build.gradle`:
 // …
 
 dependencies {
-  implementation fileTree(dir: "libs", include: ["*.jar"])
-  //noinspection GradleDynamicVersion
-  implementation "com.facebook.react:react-native:+"  // From node_modules
+  // …
 
+  implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
 + implementation "androidx.core:core-splashscreen:1.0.0-beta01"
 ```
 
@@ -86,10 +87,10 @@ For `android/app/src/main/AndroidManifest.xml`:
     <activity
       android:name=".MainActivity"
       android:label="@string/app_name"
-      android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
+      android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
       android:launchMode="singleTask"
       android:windowSoftInputMode="adjustResize"
-      android:exported="true"> <!-- note the new "exported" element needed for API31 -->
+      android:exported="true">
 +     <intent-filter>
 +         <action android:name="android.intent.action.MAIN" />
 +         <category android:name="android.intent.category.LAUNCHER" />
@@ -105,8 +106,6 @@ For `android/app/src/main/AndroidManifest.xml`:
 -       <category android:name="android.intent.category.LAUNCHER" />
 -     </intent-filter>
 -   </activity>
-
-    <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
   </application>
 </manifest>
 ```
@@ -117,37 +116,39 @@ For `android/app/src/main/java/com/yourprojectname/MainActivity.java`:
 - import android.os.Bundle;
 
 import com.facebook.react.ReactActivity;
-+ import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.ReactRootView;
 import com.zoontek.rnbootsplash.RNBootSplash;
 
 public class MainActivity extends ReactActivity {
 
-  /**
-   * Returns the name of the main component registered from JavaScript. This is used to schedule
-   * rendering of the component.
-   */
-  @Override
-  protected String getMainComponentName() {
-    return "RNBootSplashExample";
-  }
+  // …
 
 - @Override
 - protected void onCreate(Bundle savedInstanceState) {
 -   super.onCreate(savedInstanceState);
 -   RNBootSplash.init(R.drawable.bootsplash, MainActivity.this);
 - }
 
-+ @Override
-+ protected ReactActivityDelegate createReactActivityDelegate() {
-+   return new ReactActivityDelegate(this, getMainComponentName()) {
-+
-+     @Override
-+     protected void loadApp(String appKey) {
-+       RNBootSplash.init(MainActivity.this);
-+       super.loadApp(appKey);
-+     }
-+   };
-+ }
+  public static class MainActivityDelegate extends ReactActivityDelegate {
+    public MainActivityDelegate(ReactActivity activity, String mainComponentName) {
+      super(activity, mainComponentName);
+    }
+
+    @Override
+    protected ReactRootView createRootView() {
+      ReactRootView reactRootView = new ReactRootView(getContext());
+      // If you opted-in for the New Architecture, we enable the Fabric Renderer.
+      reactRootView.setIsFabric(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED);
+      return reactRootView;
+    }
+
++   @Override
++   protected void loadApp(String appKey) {
++     RNBootSplash.init(getPlainActivity());
++     super.loadApp(appKey);
++   }
+  }
 }
 ```
 

README.md

@@ -97,6 +97,8 @@ public class MainApplication extends Application implements ReactApplication {
 
 ## Setup
 
+ℹ️ For `react-native` < `0.68` documentation, check the [`v4.1.3 README.md`](https://github.com/zoontek/react-native-bootsplash/blob/4.1.3/README.md)
+
 ### Assets generation
 
 In order to speed up the setup, we provide a **CLI** to generate assets, create the Android Drawable XML file and the iOS Storyboard file automatically ✨.
@@ -172,22 +174,20 @@ ios/YourProjectName/Images.xcassets/BootSplashLogo.imageset/bootsplash_logo@3x.p
 
 _⚠️ Only `.storyboard` files are supported ([Apple has deprecated other methods in April 2020](https://developer.apple.com/news/?id=01132020b))._
 
-Edit the `ios/YourProjectName/AppDelegate.m` file:
+Edit the `ios/YourProjectName/AppDelegate.mm` file:
 
 ```obj-c
 #import "AppDelegate.h"
-
-#import <React/RCTBridge.h>
-#import <React/RCTBundleURLProvider.h>
-#import <React/RCTRootView.h>
-
 #import "RNBootSplash.h" // <- add the header import
 
+// …
+
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
   // …
+
   rootViewController.view = rootView;
   self.window.rootViewController = rootViewController;
   [self.window makeKeyAndVisible];
@@ -211,7 +211,7 @@ Set the `BootSplash.storyboard` as launch screen file:
 ```gradle
 buildscript {
   ext {
-    buildToolsVersion = "30.0.2"
+    buildToolsVersion = "31.0.0"
     minSdkVersion = 23 // <- AndroidX splashscreen has basic support for 21 (only the background color), so 23 is best
     compileSdkVersion = 31 // <- set at least 31
     targetSdkVersion = 31 // <- set at least 31
@@ -223,10 +223,9 @@ buildscript {
 
 ```gradle
 dependencies {
-  implementation fileTree(dir: "libs", include: ["*.jar"])
-  //noinspection GradleDynamicVersion
-  implementation "com.facebook.react:react-native:+"  // From node_modules
+  // …
 
+  implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
   implementation "androidx.core:core-splashscreen:1.0.0-beta01" // Add this line
 
   // …
@@ -266,18 +265,7 @@ dependencies {
     android:roundIcon="@mipmap/ic_launcher_round"
     android:allowBackup="false"
     android:theme="@style/BootTheme"> <!-- Replace @style/AppTheme with @style/BootTheme -->
-    <activity
-    android:name=".MainActivity"
-    android:label="@string/app_name"
-    android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
-    android:launchMode="singleTask"
-    android:windowSoftInputMode="adjustResize"
-    android:exported="true"> <!-- Add android:exported="true" -->
-    <intent-filter>
-      <action android:name="android.intent.action.MAIN" />
-      <category android:name="android.intent.category.LAUNCHER" />
-    </intent-filter>
-    </activity>
+    <!-- … -->
   </application>
 </manifest>
 
@@ -287,23 +275,23 @@ dependencies {
 
 ```java
 import com.facebook.react.ReactActivity;
-import com.facebook.react.ReactActivityDelegate; // <- add this necessary import
+import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.ReactRootView;
 import com.zoontek.rnbootsplash.RNBootSplash; // <- add this necessary import
 
 public class MainActivity extends ReactActivity {
 
   // …
 
-  @Override
-  protected ReactActivityDelegate createReactActivityDelegate() {
-    return new ReactActivityDelegate(this, getMainComponentName()) {
-
-      @Override
-      protected void loadApp(String appKey) {
-        RNBootSplash.init(MainActivity.this); // <- initialize the splash screen
-        super.loadApp(appKey);
-      }
-    };
+  public static class MainActivityDelegate extends ReactActivityDelegate {
+
+    // …
+
+    @Override
+    protected void loadApp(String appKey) {
+      RNBootSplash.init(getPlainActivity()); // <- initialize the splash screen
+      super.loadApp(appKey);
+    }
   }
 }
 ```

android/build.gradle

@@ -12,7 +12,7 @@ buildscript {
             mavenCentral()
         }
         dependencies {
-            classpath("com.android.tools.build:gradle:4.2.2")
+            classpath("com.android.tools.build:gradle:7.0.4")
         }
     }
 }
@@ -21,7 +21,7 @@ apply plugin: "com.android.library"
 
 android {
     compileSdkVersion safeExtGet("compileSdkVersion", 31)
-    buildToolsVersion safeExtGet("buildToolsVersion", "30.0.2")
+    buildToolsVersion safeExtGet("buildToolsVersion", "31.0.0")
     defaultConfig {
         minSdkVersion safeExtGet("minSdkVersion", 23)
         targetSdkVersion safeExtGet("targetSdkVersion", 31)

example/.bundle/config

@@ -0,0 +1,2 @@
+BUNDLE_PATH: "vendor/bundle"
+BUNDLE_FORCE_RUBY_PLATFORM: 1

example/.ruby-version

@@ -0,0 +1 @@
+2.7.4

example/Gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
+ruby '2.7.4'
+
+gem 'cocoapods', '~> 1.11', '>= 1.11.2'

example/Gemfile.lock

@@ -0,0 +1,100 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.5)
+      rexml
+    activesupport (6.1.5)
+      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.1.0)
+    cocoapods (1.11.3)
+      addressable (~> 2.8)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.11.3)
+      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.3)
+      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.6.2)
+    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.10)
+    escape (0.0.4)
+    ethon (0.15.0)
+      ffi (>= 1.15.0)
+    ffi (1.15.5)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
+    gh_inspector (1.1.3)
+    httpclient (2.8.3)
+    i18n (1.10.0)
+      concurrent-ruby (~> 1.0)
+    json (2.6.1)
+    minitest (5.15.0)
+    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.5.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cocoapods (~> 1.11, >= 1.11.2)
+
+RUBY VERSION
+   ruby 2.7.4p191
+
+BUNDLED WITH
+   2.2.27