Upgrade react-native to 0.72.1

This unfortunately has broken the unit tests.
Will have to worry about fixing them later.
Everything seems to be working other
than that.

Gemfile

@@ -1,6 +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.5'
+ruby ">= 2.6.10"
 
-gem 'cocoapods', '~> 1.11', '>= 1.11.2'
+gem 'cocoapods', '~> 1.12'

android/app/build.gradle

@@ -1,115 +1,92 @@
 apply plugin: "com.android.application"
+apply plugin: "com.facebook.react"
 apply plugin: "kotlin-android"
 
-project.ext.react = [
+/**
-        enableHermes: true,  // clean and rebuild if changing
+ * This is the configuration block to customize your React Native Android app.
-]
+ * By default you don't need to apply any configuration, just uncomment the lines you need.
+ */
+react {
+    /* Folders */
+    //   The root of your project, i.e. where "package.json" lives. Default is '..'
+    // root = file("../")
+    //   The folder where the react-native NPM package is. Default is ../node_modules/react-native
+    // reactNativeDir = file("../node_modules/react-native")
+    //   The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
+    // codegenDir = file("../node_modules/@react-native/codegen")
+    //   The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
+    // cliFile = file("../node_modules/react-native/cli.js")
 
-project.ext.vectoricons = [
+    /* Variants */
-        iconFontNames: ['MaterialIcons.ttf']
+    //   The list of variants to that are debuggable. For those we're going to
-]
+    //   skip the bundling of the JS bundle and the assets. By default is just 'debug'.
+    //   If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
+    // debuggableVariants = ["liteDebug", "prodDebug"]
 
-apply from: "../../node_modules/react-native/react.gradle"
+    /* Bundling */
-apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
+    //   A list containing the node command and its flags. Default is just 'node'.
+    // nodeExecutableAndArgs = ["node"]
+    //
+    //   The command to run when bundling. By default is 'bundle'
+    // bundleCommand = "ram-bundle"
+    //
+    //   The path to the CLI configuration file. Default is empty.
+    // bundleConfig = file(../rn-cli.config.js)
+    //
+    //   The name of the generated asset file containing your JS bundle
+    // bundleAssetName = "MyApplication.android.bundle"
+    //
+    //   The entry file for bundle generation. Default is 'index.android.js' or 'index.js'
+    // entryFile = file("../js/MyApplication.android.js")
+    //
+    //   A list of extra flags to pass to the 'bundle' commands.
+    //   See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle
+    // extraPackagerArgs = []
 
-def enableSeparateBuildPerCPUArchitecture = true
+    /* Hermes Commands */
-def enableProguardInReleaseBuilds = true
+    //   The hermes compiler command to run. By default it is 'hermesc'
-def jscFlavor = 'org.webkit:android-jsc:+'
+    // hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc"
-def enableHermes = project.ext.react.get("enableHermes", true);
+    //
-
+    //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
-def reactNativeArchitectures() {
+    // hermesFlags = ["-O", "-output-source-map"]
-    def value = project.getProperties().get("reactNativeArchitectures")
-    return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
-android {
+/**
-    java {
+ * Set this to true to Run Proguard on Release builds to minify the Java bytecode.
-        sourceCompatibility = JavaVersion.VERSION_11
+ */
-        targetCompatibility = JavaVersion.VERSION_11
+def enableProguardInReleaseBuilds = true
-    }
 
-    packagingOptions {
+/**
-        jniLibs {
+ * The preferred build flavor of JavaScriptCore (JSC)
-            pickFirsts += ['**/armeabi-v7a/libfolly_runtime.so', '**/x86/libfolly_runtime.so', '**/arm64-v8a/libfolly_runtime.so', '**/x86_64/libfolly_runtime.so']
+ *
-        }
+ * For example, to use the international variant, you can use:
-    }
+ * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
+ *
+ * The international variant includes ICU i18n library and necessary data
+ * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
+ * give correct results when using with locales other than en-US. Note that
+ * this variant is about 6MiB larger per architecture than default.
+ */
+def jscFlavor = 'org.webkit:android-jsc:+'
+
+android {
     ndkVersion rootProject.ext.ndkVersion
+
     compileSdkVersion rootProject.ext.compileSdkVersion
 
+    namespace "com.massive"
+
+    lintOptions {
+      checkReleaseBuilds false
+      abortOnError false
+    }
+
     defaultConfig {
         applicationId "com.massive"
-        missingDimensionStrategy "RNNotifications.reactNativeVersion", "reactNative60"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 36169
         versionName "1.143"
-        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
-
-        if (isNewArchitectureEnabled()) {
-            externalNativeBuild {
-                ndkBuild {
-                    arguments "APP_PLATFORM=android-21",
-                            "APP_STL=c++_shared",
-                            "NDK_TOOLCHAIN_VERSION=clang",
-                            "GENERATED_SRC_DIR=$buildDir/generated/source",
-                            "PROJECT_BUILD_DIR=$buildDir",
-                            "REACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid",
-                            "REACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build",
-                            "NODE_MODULES_DIR=$rootDir/../node_modules"
-                    cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
-                    cppFlags "-std=c++17"
-                    targets "massive_appmodules"
-                }
-            }
-            if (!enableSeparateBuildPerCPUArchitecture) {
-                ndk {
-                    abiFilters(*reactNativeArchitectures())
-                }
-            }
-        }
-    }
-
-    if (isNewArchitectureEnabled()) {
-        externalNativeBuild {
-            ndkBuild {
-                path "$projectDir/src/main/jni/Android.mk"
-            }
-        }
-        def reactAndroidProjectDir = project(':ReactAndroid').projectDir
-        def packageReactNdkDebugLibs = tasks.register("packageReactNdkDebugLibs", Copy) {
-            dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck")
-            from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
-            into("$buildDir/react-ndk/exported")
-        }
-        def packageReactNdkReleaseLibs = tasks.register("packageReactNdkReleaseLibs", Copy) {
-            dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck")
-            from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
-            into("$buildDir/react-ndk/exported")
-        }
-        afterEvaluate {
-            preDebugBuild.dependsOn(packageReactNdkDebugLibs)
-            preReleaseBuild.dependsOn(packageReactNdkReleaseLibs)
-
-            configureNdkBuildRelease.dependsOn(preReleaseBuild)
-            configureNdkBuildDebug.dependsOn(preDebugBuild)
-            reactNativeArchitectures().each { architecture ->
-                tasks.findByName("configureNdkBuildDebug[${architecture}]")?.configure {
-                    dependsOn("preDebugBuild")
-                }
-                tasks.findByName("configureNdkBuildRelease[${architecture}]")?.configure {
-                    dependsOn("preReleaseBuild")
-                }
-            }
-        }
-    }
-
-    splits {
-        abi {
-            reset()
-            enable enableSeparateBuildPerCPUArchitecture
-            universalApk false
-            include(*reactNativeArchitectures())
-        }
     }
     signingConfigs {
         release {
@@ -129,15 +106,14 @@ android {
             }
         }
     }
-    buildFeatures {
-        viewBinding true
-    }
     buildTypes {
         debug {
             signingConfig signingConfigs.debug
         }
         release {
-            signingConfig signingConfigs.release
+            // Caution! In production, you need to generate your own keystore file.
+            // see https://reactnative.dev/docs/signed-apk-android.
+            signingConfig signingConfigs.debug
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
@@ -145,65 +121,28 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.4.1'
+    // The version of react-native is set by the React Native Gradle Plugin
-    implementation 'com.google.android.material:material:1.4.+'
+    implementation("com.facebook.react:react-android")
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation 'androidx.databinding:databinding-runtime:7.1.2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
-    def work_version = "2.7.1"
-
-    implementation "androidx.work:work-runtime:$work_version"
-    implementation "androidx.work:work-runtime-ktx:$work_version"
-    implementation "androidx.work:work-rxjava2:$work_version"
-    androidTestImplementation "androidx.work:work-testing:$work_version"
-    implementation "androidx.work:work-multiprocess:$work_version"
-    implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "com.facebook.react:react-native:+"  // From node_modules
-    implementation "androidx.core:core-ktx:1.8.0"
     implementation project(':react-native-sqlite-storage')
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+    implementation project(':react-native-vector-icons')
-
-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
-        exclude group: 'com.facebook.fbjni'
-    }
 
+    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
     debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
-        exclude group: 'com.facebook.flipper'
+        exclude group:'com.squareup.okhttp3', module:'okhttp'
-        exclude group: 'com.squareup.okhttp3', module: 'okhttp'
     }
 
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
+    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
-        exclude group: 'com.facebook.flipper'
+    if (hermesEnabled.toBoolean()) {
-    }
+        implementation("com.facebook.react:hermes-android")
-
-    if (enableHermes) {
-        implementation("com.facebook.react:hermes-engine:+") { // From node_modules
-            exclude group: 'com.facebook.fbjni'
-        }
     } else {
         implementation jscFlavor
     }
 }
 
-if (isNewArchitectureEnabled()) {
-    configurations.all {
-        resolutionStrategy.dependencySubstitution {
-            substitute(module("com.facebook.react:react-native"))
-                    .using(project(":ReactAndroid"))
-                    .because("On New Architecture we're building React Native from source")
-            substitute(module("com.facebook.react:hermes-engine"))
-                    .using(project(":ReactAndroid:hermes-engine"))
-                    .because("On New Architecture we're building Hermes from source")
-        }
-    }
-}
-
-task copyDownloadableDepsToLibs(type: Copy) {
-    from configurations.implementation
-    into 'libs'
-}
-
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
-
+project.ext.vectoricons = [
-def isNewArchitectureEnabled() {
+  iconFontNames: ['MaterialIcons.ttf']
-    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+]
-}
+apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"

android/app/src/debug/java/com/massive/ReactNativeFlipper.java

@@ -17,7 +17,6 @@ import com.facebook.flipper.plugins.inspector.DescriptorMapping;
 import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
 import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
 import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
-import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
 import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
 import com.facebook.react.ReactInstanceEventListener;
 import com.facebook.react.ReactInstanceManager;
@@ -25,13 +24,16 @@ import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.network.NetworkingModule;
 import okhttp3.OkHttpClient;
 
+/**
+ * Class responsible of loading Flipper inside your React Native application. This is the debug
+ * flavor of it. Here you can add your own plugins and customize the Flipper setup.
+ */
 public class ReactNativeFlipper {
   public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
     if (FlipperUtils.shouldEnableFlipper(context)) {
       final FlipperClient client = AndroidFlipperClient.getInstance(context);
 
       client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
-      client.addPlugin(new ReactFlipperPlugin());
       client.addPlugin(new DatabasesFlipperPlugin(context));
       client.addPlugin(new SharedPreferencesFlipperPlugin(context));
       client.addPlugin(CrashReporterPlugin.getInstance());

android/app/src/main/AndroidManifest.xml

@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools">
-    package="com.massive">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+
     <uses-permission
         android:name="android.permission.ACCESS_NETWORK_STATE"
         tools:node="remove" />
 
     <application
-        android:name=".MainApplication"
+      android:name=".MainApplication"
-        android:allowBackup="false"
+      android:label="@string/app_name"
-        android:dataExtractionRules="@xml/data_extraction_rules"
+      android:icon="@mipmap/ic_launcher"
-        android:icon="@mipmap/ic_launcher"
+      android:roundIcon="@mipmap/ic_launcher_round"
-        android:label="@string/app_name"
+      android:allowBackup="false"
-        android:roundIcon="@mipmap/ic_launcher_round"
+      android:theme="@style/AppTheme">
-        android:requestLegacyExternalStorage="true"
+      <activity
-        android:theme="@style/AppTheme">
+        android:name=".MainActivity"
-        <activity
+        android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
-            android:name=".TimerDone"
+        android:launchMode="singleTask"
-            android:exported="false">
+        android:windowSoftInputMode="adjustResize"
-            <meta-data
+        android:exported="true">
-                android:name="android.app.lib_name"
+        <intent-filter>
-                android:value="" />
+            <action android:name="android.intent.action.MAIN" />
-        </activity>
+            <category android:name="android.intent.category.LAUNCHER" />
-        <activity
+        </intent-filter>
-            android:name=".MainActivity"
+      </activity>
-            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
-            android:exported="true"
-            android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustResize">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
+      <activity
-            </intent-filter>
+          android:name=".TimerDone"
-        </activity>
+          android:exported="false">
-        <activity
+          <meta-data
-            android:name=".StopAlarm"
+              android:name="android.app.lib_name"
-            android:exported="true"
+              android:value="" />
-            android:process=":remote" />
+      </activity>
 
-        <service
+      <activity
-            android:name=".AlarmService"
+          android:name=".StopAlarm"
-            android:exported="false" />
+          android:exported="true"
+          android:process=":remote" />
+
+      <service
+          android:name=".AlarmService"
+          android:exported="false" />
     </application>
-
 </manifest>

android/app/src/main/java/com/massive/MainActivity.kt

@@ -2,32 +2,27 @@ package com.massive
 
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
-import com.facebook.react.ReactRootView
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
-import android.os.Bundle;
+import com.facebook.react.defaults.DefaultReactActivityDelegate
 
 class MainActivity : ReactActivity() {
+    /**
+     * Returns the name of the main component registered from JavaScript. This is used to schedule
+     * rendering of the component.
+     */
     override fun getMainComponentName(): String? {
         return "massive"
     }
 
+    /**
+     * Returns the instance of the [ReactActivityDelegate]. Here we use a util class [ ] which allows you to easily enable Fabric and Concurrent React
+     * (aka React 18) with two boolean flags.
+     */
     override fun createReactActivityDelegate(): ReactActivityDelegate {
-        return MainActivityDelegate(this, mainComponentName)
+        return DefaultReactActivityDelegate(
+            this,
+            mainComponentName!!,  // If you opted-in for the New Architecture, we enable the Fabric Renderer.
+            fabricEnabled
+        )
     }
-
+}
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(null)
-    }
-
-    class MainActivityDelegate(activity: ReactActivity?, mainComponentName: String?) :
-        ReactActivityDelegate(activity, mainComponentName) {
-        override fun createRootView(): ReactRootView {
-            val reactRootView = ReactRootView(context)
-            reactRootView.setIsFabric(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED)
-            return reactRootView
-        }
-
-        override fun isConcurrentRootEnabled(): Boolean {
-            return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
-        }
-    }
-}

android/app/src/main/java/com/massive/MainApplication.kt

@@ -1,15 +1,16 @@
 package com.massive
 
 import android.app.Application
-import android.content.Context
+import com.facebook.react.PackageList
-import com.facebook.react.*
+import com.facebook.react.ReactApplication
-import com.facebook.react.config.ReactFeatureFlags
+import com.facebook.react.ReactNativeHost
+import com.facebook.react.ReactPackage
+import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
+import com.facebook.react.defaults.DefaultReactNativeHost
 import com.facebook.soloader.SoLoader
-import com.massive.newarchitecture.MainApplicationReactNativeHost
-import java.lang.reflect.InvocationTargetException
 
 class MainApplication : Application(), ReactApplication {
-    private val mReactNativeHost: ReactNativeHost = object : ReactNativeHost(this) {
+    private val mReactNativeHost: ReactNativeHost = object : DefaultReactNativeHost(this) {
         override fun getUseDeveloperSupport(): Boolean {
             return BuildConfig.DEBUG
         }
@@ -23,48 +24,24 @@ class MainApplication : Application(), ReactApplication {
         override fun getJSMainModuleName(): String {
             return "index"
         }
+
+        override val isNewArchEnabled: Boolean
+            protected get() = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+        override val isHermesEnabled: Boolean
+            protected get() = BuildConfig.IS_HERMES_ENABLED
     }
 
-    private val mNewArchitectureNativeHost: ReactNativeHost = MainApplicationReactNativeHost(this)
     override fun getReactNativeHost(): ReactNativeHost {
-        return if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+        return mReactNativeHost
-            mNewArchitectureNativeHost
-        } else {
-            mReactNativeHost
-        }
     }
 
     override fun onCreate() {
         super.onCreate()
-        ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
+        SoLoader.init(this,  /* native exopackage */false)
-        SoLoader.init(this, false)
+        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-        initializeFlipper(this, reactNativeHost.reactInstanceManager)
+            // If you opted-in for the New Architecture, we load the native entry point for this app.
-    }
+            load()
-
-    companion object {
-        private fun initializeFlipper(
-            context: Context, reactInstanceManager: ReactInstanceManager
-        ) {
-            if (BuildConfig.DEBUG) {
-                try {
-                    val aClass = Class.forName("com.massive.ReactNativeFlipper")
-                    aClass
-                        .getMethod(
-                            "initializeFlipper",
-                            Context::class.java,
-                            ReactInstanceManager::class.java
-                        )
-                        .invoke(null, context, reactInstanceManager)
-                } catch (e: ClassNotFoundException) {
-                    e.printStackTrace()
-                } catch (e: NoSuchMethodException) {
-                    e.printStackTrace()
-                } catch (e: IllegalAccessException) {
-                    e.printStackTrace()
-                } catch (e: InvocationTargetException) {
-                    e.printStackTrace()
-                }
-            }
         }
+        ReactNativeFlipper.initializeFlipper(this, reactNativeHost.reactInstanceManager)
     }
-}
+}

android/app/src/release/java/com/massive/ReactNativeFlipper.java

@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
+ * directory of this source tree.
+ */
+package com.massive;
+
+import android.content.Context;
+import com.facebook.react.ReactInstanceManager;
+
+/**
+ * Class responsible of loading Flipper inside your React Native application. This is the release
+ * flavor of it so it's empty as we don't want to load Flipper.
+ */
+public class ReactNativeFlipper {
+  public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
+    // Do nothing as we don't want to initialize Flipper on Release.
+  }
+}

android/build.gradle

@@ -1,55 +1,22 @@
-import org.apache.tools.ant.taskdefs.condition.Os
-
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
     ext {
-        kotlin_version = '1.6.10'
+        buildToolsVersion = "33.0.0"
-        buildToolsVersion = "31.0.0"
         minSdkVersion = 21
-        compileSdkVersion = 31
+        compileSdkVersion = 33
-        targetSdkVersion = 31
+        targetSdkVersion = 33
 
-        if (System.properties['os.arch'] == "aarch64") {
+        // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
-            // For M1 Users we need to use the NDK 24 which added support for aarch64
+        ndkVersion = "23.1.7779620"
-            ndkVersion = "24.0.8215888"
-        } else {
-            // Otherwise we default to the side-by-side NDK version from AGP.
-            ndkVersion = "21.4.7075529"
-        }
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath('com.android.tools.build:gradle:7.2.1')
+        classpath("com.android.tools.build:gradle")
         classpath("com.facebook.react:react-native-gradle-plugin")
-        classpath("de.undercouch:gradle-download-task:5.0.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22")
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        maven {
-            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url("$rootDir/../node_modules/react-native/android")
-        }
-        maven {
-            // Android JSC is installed from npm
-            url("$rootDir/../node_modules/jsc-android/dist")
-        }
-        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()
-        maven { url 'https://www.jitpack.io' }
     }
 }

android/gradle.properties

@@ -25,7 +25,7 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.125.0
+FLIPPER_VERSION=0.182.0
 
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using
@@ -38,3 +38,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
 newArchEnabled=false
+
+# Use this property to enable or disable the Hermes JS engine.
+# If set to false, you will be using JSC instead.
+hermesEnabled=true

android/gradle/wrapper/gradle-wrapper.properties

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

android/gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# This is normally unused
-
+# shellcheck disable=SC2034
-APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

android/gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

android/settings.gradle

@@ -1,13 +1,6 @@
 rootProject.name = 'massive'
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
-includeBuild('../node_modules/react-native-gradle-plugin')
+includeBuild('../node_modules/@react-native/gradle-plugin')
 include ':react-native-sqlite-storage'
 project(':react-native-sqlite-storage').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-sqlite-storage/platforms/android')
-
-if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") {
-    include(":ReactAndroid")
-    project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid')
-    include(":ReactAndroid:hermes-engine")
-    project(":ReactAndroid:hermes-engine").projectDir = file('../node_modules/react-native/ReactAndroid/hermes-engine')
-}

babel.config.js

@@ -4,8 +4,8 @@ module.exports = {
     '@babel/plugin-transform-flow-strip-types',
     ['@babel/plugin-proposal-decorators', {legacy: true}],
     ['@babel/plugin-proposal-class-properties', {loose: true}],
-    'react-native-reanimated/plugin',
     'react-native-paper/babel',
+    'react-native-reanimated/plugin',
   ],
   env: {
     production: {

index.js

@@ -1,6 +1,9 @@
-import {AppRegistry} from 'react-native'
+/**
-import 'react-native-gesture-handler'
+ * @format
-import App from './App'
+ */
-import {name as appName} from './app.json'
 
-AppRegistry.registerComponent(appName, () => App)
+import {AppRegistry} from 'react-native';
+import App from './App';
+import {name as appName} from './app.json';
+
+AppRegistry.registerComponent(appName, () => App);

ios/.xcode.env

@@ -0,0 +1,11 @@
+# This `.xcode.env` file is versioned and is used to source the environment
+# used when running script phases inside Xcode.
+# To customize your local environment, you can create an `.xcode.env.local`
+# file that is not versioned.
+
+# NODE_BINARY variable contains the PATH to the node executable.
+#
+# Customize the NODE_BINARY variable here.
+# For example, to use nvm with brew, add the following line
+# . "$(brew --prefix nvm)/nvm.sh" --no-use
+export NODE_BINARY=$(command -v node)

ios/Podfile

@@ -1,8 +1,29 @@
-require_relative '../node_modules/react-native/scripts/react_native_pods'
+# Resolve react_native_pods.rb with node to allow for hoisting
-require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
+require Pod::Executable.execute_command('node', ['-p',
+  'require.resolve(
+    "react-native/scripts/react_native_pods.rb",
+    {paths: [process.argv[1]]},
+  )', __dir__]).strip
 
-platform :ios, '12.4'
+platform :ios, min_ios_version_supported
-install! 'cocoapods', :deterministic_uuids => false
+prepare_react_native_project!
+
+# If you are using a `react-native-flipper` your iOS build will fail when `NO_FLIPPER=1` is set.
+# because `react-native-flipper` depends on (FlipperKit,...) that will be excluded
+#
+# To fix this you can also exclude `react-native-flipper` using a `react-native.config.js`
+# ```js
+# module.exports = {
+#   dependencies: {
+#     ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
+# ```
+flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled
+
+linkage = ENV['USE_FRAMEWORKS']
+if linkage != nil
+  Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
+  use_frameworks! :linkage => linkage.to_sym
+end
 
 target 'massive' do
   config = use_native_modules!
@@ -12,9 +33,14 @@ target 'massive' do
 
   use_react_native!(
     :path => config[:reactNativePath],
-    # to enable hermes on iOS, change `false` to `true` and then install pods
+    # Hermes is now enabled by default. Disable by setting this flag to false.
     :hermes_enabled => flags[:hermes_enabled],
     :fabric_enabled => flags[:fabric_enabled],
+    # Enables Flipper.
+    #
+    # Note that if you have use_frameworks! enabled, Flipper will not work and
+    # you should disable the next line.
+    :flipper_configuration => flipper_config,
     # An absolute path to your application root.
     :app_path => "#{Pod::Config.instance.installation_root}/.."
   )
@@ -24,14 +50,13 @@ target 'massive' do
     # Pods for testing
   end
 
-  # Enables Flipper.
-  #
-  # Note that if you have use_frameworks! enabled, Flipper will not work and
-  # you should disable the next line.
-  use_flipper!()
-
   post_install do |installer|
-    react_native_post_install(installer)
+    # https://github.com/facebook/react-native/blob/main/packages/react-native/scripts/react_native_pods.rb#L197-L202
+    react_native_post_install(
+      installer,
+      config[:reactNativePath],
+      :mac_catalyst_enabled => false
+    )
     __apply_Xcode_12_5_M1_post_install_workaround(installer)
   end
 end

ios/massive.xcodeproj/project.pbxproj

@@ -43,7 +43,6 @@
 		5DCACB8F33CDC322A6C60F78 /* libPods-massive.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-massive.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = massive/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		89C6BE57DB24E9ADA2F236DE /* Pods-massive-massiveTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-massive-massiveTests.release.xcconfig"; path = "Target Support Files/Pods-massive-massiveTests/Pods-massive-massiveTests.release.xcconfig"; sourceTree = "<group>"; };
-		CA043791292233DB00942DF1 /* MaterialIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = MaterialIcons.ttf; path = "../../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
@@ -117,7 +116,6 @@
 		83CBB9F61A601CBA00E9B192 = {
 			isa = PBXGroup;
 			children = (
-				CA043790292233A900942DF1 /* Fonts */,
 				13B07FAE1A68108700A75B9A /* massive */,
 				832341AE1AAA6A7D00B99B32 /* Libraries */,
 				00E356EF1AD99517003FC87E /* massiveTests */,
@@ -150,14 +148,6 @@
 			path = Pods;
 			sourceTree = "<group>";
 		};
-		CA043790292233A900942DF1 /* Fonts */ = {
-			isa = PBXGroup;
-			children = (
-				CA043791292233DB00942DF1 /* MaterialIcons.ttf */,
-			);
-			path = Fonts;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -502,6 +492,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -527,6 +518,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				MARKETING_VERSION = 1.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -572,7 +564,7 @@
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -606,7 +598,6 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
-				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 			};
 			name = Debug;
@@ -644,7 +635,7 @@
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
+				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -670,7 +661,6 @@
 					"-DFOLLY_MOBILE=1",
 					"-DFOLLY_USE_LIBCPP=1",
 				);
-				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};

ios/massive/AppDelegate.h

@@ -1,8 +1,6 @@
-#import <React/RCTBridgeDelegate.h>
+#import <RCTAppDelegate.h>
 #import <UIKit/UIKit.h>
 
-@interface AppDelegate : UIResponder <UIApplicationDelegate, RCTBridgeDelegate>
+@interface AppDelegate : RCTAppDelegate
-
-@property (nonatomic, strong) UIWindow *window;
 
 @end

ios/massive/AppDelegate.mm

@@ -1,85 +1,17 @@
 #import "AppDelegate.h"
 
-#import <React/RCTBridge.h>
 #import <React/RCTBundleURLProvider.h>
-#import <React/RCTRootView.h>
-
-#import <React/RCTAppSetupUtils.h>
-
-#if RCT_NEW_ARCH_ENABLED
-#import <React/CoreModulesPlugins.h>
-#import <React/RCTCxxBridgeDelegate.h>
-#import <React/RCTFabricSurfaceHostingProxyRootView.h>
-#import <React/RCTSurfacePresenter.h>
-#import <React/RCTSurfacePresenterBridgeAdapter.h>
-#import <ReactCommon/RCTTurboModuleManager.h>
-
-#import <react/config/ReactNativeConfig.h>
-
-static NSString *const kRNConcurrentRoot = @"concurrentRoot";
-
-@interface AppDelegate () <RCTCxxBridgeDelegate, RCTTurboModuleManagerDelegate> {
-  RCTTurboModuleManager *_turboModuleManager;
-  RCTSurfacePresenterBridgeAdapter *_bridgeAdapter;
-  std::shared_ptr<const facebook::react::ReactNativeConfig> _reactNativeConfig;
-  facebook::react::ContextContainer::Shared _contextContainer;
-}
-@end
-#endif
 
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
-  RCTAppSetupPrepareApp(application);
+  self.moduleName = @"massive";
+  // You can add your custom initial props in the dictionary below.
+  // They will be passed down to the ViewController used by React Native.
+  self.initialProps = @{};
 
-  RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
+  return [super application:application didFinishLaunchingWithOptions:launchOptions];
-
-#if RCT_NEW_ARCH_ENABLED
-  _contextContainer = std::make_shared<facebook::react::ContextContainer const>();
-  _reactNativeConfig = std::make_shared<facebook::react::EmptyReactNativeConfig const>();
-  _contextContainer->insert("ReactNativeConfig", _reactNativeConfig);
-  _bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:bridge contextContainer:_contextContainer];
-  bridge.surfacePresenter = _bridgeAdapter.surfacePresenter;
-#endif
-
-  NSDictionary *initProps = [self prepareInitialProps];
-  UIView *rootView = RCTAppSetupDefaultRootView(bridge, @"massive", initProps);
-
-  if (@available(iOS 13.0, *)) {
-    rootView.backgroundColor = [UIColor systemBackgroundColor];
-  } else {
-    rootView.backgroundColor = [UIColor whiteColor];
-  }
-
-  self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-  UIViewController *rootViewController = [UIViewController new];
-  rootViewController.view = rootView;
-  self.window.rootViewController = rootViewController;
-  [self.window makeKeyAndVisible];
-  return YES;
-}
-
-/// This method controls whether the `concurrentRoot`feature of React18 is turned on or off.
-///
-/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html
-/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture).
-/// @return: `true` if the `concurrentRoot` feture is enabled. Otherwise, it returns `false`.
-- (BOOL)concurrentRootEnabled
-{
-  // Switch this bool to turn on and off the concurrent root
-  return true;
-}
-
-- (NSDictionary *)prepareInitialProps
-{
-  NSMutableDictionary *initProps = [NSMutableDictionary new];
-
-#ifdef RCT_NEW_ARCH_ENABLED
-  initProps[kRNConcurrentRoot] = @([self concurrentRootEnabled]);
-#endif
-
-  return initProps;
 }
 
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
@@ -91,43 +23,4 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot";
 #endif
 }
 
-#if RCT_NEW_ARCH_ENABLED
-
-#pragma mark - RCTCxxBridgeDelegate
-
-- (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge
-{
-  _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge
-                                                             delegate:self
-                                                            jsInvoker:bridge.jsCallInvoker];
-  return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager);
-}
-
-#pragma mark RCTTurboModuleManagerDelegate
-
-- (Class)getModuleClassFromName:(const char *)name
-{
-  return RCTCoreModulesClassProvider(name);
-}
-
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
-                                                      jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
-{
-  return nullptr;
-}
-
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
-                                                     initParams:
-                                                         (const facebook::react::ObjCTurboModule::InitParams &)params
-{
-  return nullptr;
-}
-
-- (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass
-{
-  return RCTAppSetupDefaultModuleFromClass(moduleClass);
-}
-
-#endif
-
 @end

ios/massive/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,53 +1,53 @@
 {
-  "images": [
+  "images" : [
     {
-      "idiom": "iphone",
+      "idiom" : "iphone",
-      "scale": "2x",
+      "scale" : "2x",
-      "size": "20x20"
+      "size" : "20x20"
     },
     {
-      "idiom": "iphone",
+      "idiom" : "iphone",
-      "scale": "3x",
+      "scale" : "3x",
-      "size": "20x20"
+      "size" : "20x20"
     },
     {
-      "idiom": "iphone",
+      "idiom" : "iphone",
-      "scale": "2x",
+      "scale" : "2x",
-      "size": "29x29"
+      "size" : "29x29"
     },
     {
-      "idiom": "iphone",
+      "idiom" : "iphone",
-      "scale": "3x",
+      "scale" : "3x",
-      "size": "29x29"
+      "size" : "29x29"
     },
     {
-      "idiom": "iphone",
+      "idiom" : "iphone",
-      "scale": "2x",
+      "scale" : "2x",
-      "size": "40x40"
+      "size" : "40x40"
     },
     {
-      "idiom": "iphone",
+      "idiom" : "iphone",
-      "scale": "3x",
+      "scale" : "3x",
-      "size": "40x40"
+      "size" : "40x40"
     },
     {
-      "idiom": "iphone",
+      "idiom" : "iphone",
-      "scale": "2x",
+      "scale" : "2x",
-      "size": "60x60"
+      "size" : "60x60"
     },
     {
-      "idiom": "iphone",
+      "idiom" : "iphone",
-      "scale": "3x",
+      "scale" : "3x",
-      "size": "60x60"
+      "size" : "60x60"
     },
     {
-      "idiom": "ios-marketing",
+      "idiom" : "ios-marketing",
-      "scale": "1x",
+      "scale" : "1x",
-      "size": "1024x1024"
+      "size" : "1024x1024"
     }
   ],
-  "info": {
+  "info" : {
-    "author": "xcode",
+    "author" : "xcode",
-    "version": 1
+    "version" : 1
   }
 }

ios/massive/Images.xcassets/Contents.json

@@ -1,6 +1,6 @@
 {
-  "info": {
+  "info" : {
-    "version": 1,
+    "version" : 1,
-    "author": "xcode"
+    "author" : "xcode"
   }
 }

ios/massive/Info.plist

@@ -2,10 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>UIAppFonts</key>
-	<array>
-		<string>MaterialIcons.ttf</string>
-	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -21,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
@@ -47,10 +43,6 @@
 	<array>
 		<string>armv7</string>
 	</array>
-	<key>UIFileSharingEnabled</key>
-	<true/>
-	<key>LSSupportsOpeningDocumentsInPlace</key>
-	<true/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

metro.config.js

@@ -1,17 +1,11 @@
-/**
+const {getDefaultConfig, mergeConfig} = require('@react-native/metro-config');
- * Metro configuration for React Native
- * https://github.com/facebook/react-native
- *
- * @format
- */
 
-module.exports = {
+/**
-  transformer: {
+ * Metro configuration
-    getTransformOptions: async () => ({
+ * https://facebook.github.io/metro/docs/configuration
-      transform: {
+ *
-        experimentalImportSupport: false,
+ * @type {import('metro-config').MetroConfig}
-        inlineRequires: true,
+ */
-      },
+const config = {};
-    }),
+
-  },
+module.exports = mergeConfig(getDefaultConfig(__dirname), config);
-}

package.json

@@ -4,15 +4,17 @@
   "private": true,
   "license": "GPL-3.0-only",
   "scripts": {
-    "android": "react-native run-android",
+    "android": "react-native run-android --active-arch-only",
-    "release": "react-native run-android --variant=release",
+    "release": "react-native run-android --mode release --active-arch-only",
+    "ios": "react-native run-ios",
+    "lint": "eslint .",
     "start": "react-native start",
-    "test": "jest",
+    "test": "jest"
-    "lint": "eslint . --ext .js,.jsx,.ts,.tsx"
   },
   "dependencies": {
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-proposal-decorators": "^7.22.6",
     "@babel/plugin-transform-flow-strip-types": "^7.19.0",
-    "@babel/preset-env": "^7.19.1",
     "@react-native-community/datetimepicker": "^6.7.1",
     "@react-native-masked-view/masked-view": "^0.2.7",
     "@react-navigation/drawer": "^6.5.0",
@@ -21,25 +23,23 @@
     "@testing-library/jest-native": "^5.1.2",
     "@testing-library/react-native": "^11.3.0",
     "@types/d3-shape": "^3.1.0",
-    "@types/jest": "^29.2.0",
     "@types/react-native-sqlite-storage": "^5.0.2",
     "@types/react-native-svg-charts": "^5.0.12",
     "@types/react-native-vector-icons": "^6.4.12",
-    "babel-jest": "^29.2.2",
     "babel-plugin-transform-remove-console": "^6.9.4",
+    "babel-preset-react-native": "^4.0.1",
     "date-fns": "^2.29.3",
     "eslint-plugin-flowtype": "^8.0.3",
-    "jest": "^29.2.2",
+    "react": "18.2.0",
-    "react": "18.1.0",
     "react-hook-form": "^7.41.2",
-    "react-native": "0.70.7",
+    "react-native": "0.72.1",
     "react-native-document-picker": "^8.1.2",
     "react-native-file-access": "^2.5.0",
     "react-native-gesture-handler": "^2.8.0",
     "react-native-linear-gradient": "^2.6.2",
     "react-native-pager-view": "^6.0.1",
     "react-native-paper": "^4.12.5",
-    "react-native-reanimated": "^2.12.0",
+    "react-native-reanimated": "^3.3.0",
     "react-native-safe-area-context": "^4.4.1",
     "react-native-screens": "^3.18.2",
     "react-native-share": "^7.9.1",
@@ -48,32 +48,28 @@
     "react-native-svg-charts": "^5.4.0",
     "react-native-vector-icons": "^9.2.0",
     "react-native-view-shot": "^3.4.0",
-    "react-test-renderer": "^18.2.0",
+    "typeorm": "^0.3.17"
-    "typeorm": "^0.3.10"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.9",
+    "@babel/core": "^7.20.0",
-    "@babel/plugin-proposal-decorators": "^7.20.0",
+    "@babel/preset-env": "^7.22.6",
-    "@babel/runtime": "^7.12.5",
+    "@babel/runtime": "^7.20.0",
-    "@react-native-community/eslint-config": "^2.0.0",
+    "@react-native/eslint-config": "^0.72.2",
-    "@types/node": "^18.11.7",
+    "@react-native/metro-config": "^0.72.7",
-    "@types/react-native": "^0.69.0",
+    "@tsconfig/react-native": "^3.0.0",
+    "@types/jest": "^29.5.2",
+    "@types/metro-config": "^0.76.3",
+    "@types/react": "^18.0.24",
     "@types/react-test-renderer": "^18.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.29.0",
+    "babel-jest": "^29.6.0",
-    "@typescript-eslint/parser": "^5.29.0",
+    "eslint": "^8.19.0",
-    "eslint": "^8.26.0",
+    "jest": "^29.6.0",
-    "metro-react-native-babel-preset": "^0.73.3",
+    "metro-react-native-babel-preset": "^0.76.7",
-    "react-native-testing-library": "^6.0.0",
+    "prettier": "^2.4.1",
-    "typescript": "^4.8.4"
+    "react-test-renderer": "^18.2.0",
+    "typescript": "^5.1.6"
   },
-  "eslintConfig": {
+  "engines": {
-    "extends": "react-app",
+    "node": ">=16"
-    "rules": {
+  }
-      "curly": "off"
-    }
-  },
-  "resolutions": {
-    "@types/react": "^18"
-  },
-  "packageManager": "yarn@3.2.1"
 }

tests/App.test.tsx

@@ -1,6 +1,6 @@
+import { render, waitFor } from '@testing-library/react-native'
 import React from 'react'
 import 'react-native'
-import { render, waitFor } from 'react-native-testing-library'
 import App from '../App'
 import Settings from '../settings'
 

tests/EditPlan.test.tsx

@@ -1,7 +1,7 @@
 import { createStackNavigator } from '@react-navigation/stack'
 import React from 'react'
 import 'react-native'
-import { render, waitFor } from 'react-native-testing-library'
+import { render, waitFor } from '@testing-library/react-native'
 import EditPlan from '../EditPlan'
 import { MockProviders } from '../mock-providers'
 import { Plan } from '../plan'

tests/EditSet.test.tsx

@@ -1,7 +1,7 @@
 import { createStackNavigator } from '@react-navigation/stack'
 import React from 'react'
 import 'react-native'
-import { fireEvent, render, waitFor } from 'react-native-testing-library'
+import { fireEvent, render, waitFor } from '@testing-library/react-native'
 import EditSet from '../EditSet'
 import GymSet from '../gym-set'
 import { HomePageParams } from '../home-page-params'

tests/EditSets.test.tsx

@@ -1,7 +1,7 @@
 import { createStackNavigator } from '@react-navigation/stack'
 import React from 'react'
 import 'react-native'
-import { fireEvent, render, waitFor } from 'react-native-testing-library'
+import { fireEvent, render, waitFor } from '@testing-library/react-native'
 import EditSets from '../EditSets'
 import { HomePageParams } from '../home-page-params'
 import { MockProviders } from '../mock-providers'

tests/EditWorkout.test.tsx

@@ -1,7 +1,7 @@
 import { createStackNavigator } from '@react-navigation/stack'
 import React from 'react'
 import 'react-native'
-import { render, waitFor } from 'react-native-testing-library'
+import { render, waitFor } from '@testing-library/react-native'
 import EditWorkout from '../EditWorkout'
 import GymSet from '../gym-set'
 import { MockProviders } from '../mock-providers'

tests/GraphsPage.test.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import 'react-native'
-import { fireEvent, render, waitFor } from 'react-native-testing-library'
+import { fireEvent, render, waitFor } from '@testing-library/react-native'
 import GraphsPage from '../GraphsPage'
 import { MockProviders } from '../mock-providers'
 import Settings from '../settings'

tests/HomePage.test.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import 'react-native'
-import { render, waitFor } from 'react-native-testing-library'
+import { render, waitFor } from '@testing-library/react-native'
 import { Repository } from 'typeorm'
 import GymSet from '../gym-set'
 import HomePage from '../HomePage'

tests/PlanList.test.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import 'react-native'
-import { fireEvent, render, waitFor } from 'react-native-testing-library'
+import { fireEvent, render, waitFor } from '@testing-library/react-native'
 import { MockProviders } from '../mock-providers'
 import { Plan } from '../plan'
 import PlanPage from '../PlanPage'

tests/PlanPage.test.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import 'react-native'
-import { render, waitFor } from 'react-native-testing-library'
+import { render, waitFor } from '@testing-library/react-native'
 import { Repository } from 'typeorm'
 import GymSet from '../gym-set'
 import { MockProviders } from '../mock-providers'

tests/SettingsPage.test.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import 'react-native'
-import { render, waitFor } from 'react-native-testing-library'
+import { render, waitFor } from '@testing-library/react-native'
 import { Repository } from 'typeorm'
 import GymSet from '../gym-set'
 import { MockProviders } from '../mock-providers'

tests/StartPlan.test.tsx

@@ -1,7 +1,7 @@
 import { createStackNavigator } from '@react-navigation/stack'
 import React from 'react'
 import 'react-native'
-import { fireEvent, render, waitFor } from 'react-native-testing-library'
+import { fireEvent, render, waitFor } from '@testing-library/react-native'
 import GymSet from '../gym-set'
 import { MockProviders } from '../mock-providers'
 import { Plan } from '../plan'

tests/TimerPage.test.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import 'react-native'
-import { render, waitFor } from 'react-native-testing-library'
+import { render, waitFor } from '@testing-library/react-native'
 import { Repository } from 'typeorm'
 import GymSet from '../gym-set'
 import { MockProviders } from '../mock-providers'

tests/ViewGraph.test.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import 'react-native'
-import { fireEvent, render, waitFor } from 'react-native-testing-library'
+import { fireEvent, render, waitFor } from '@testing-library/react-native'
 import GraphsPage from '../GraphsPage'
 import { MockProviders } from '../mock-providers'
 import Settings from '../settings'

tests/WorkoutsPage.test.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import 'react-native'
-import { render, waitFor } from 'react-native-testing-library'
+import { render, waitFor } from '@testing-library/react-native'
 import { Repository } from 'typeorm'
 import GymSet from '../gym-set'
 import { MockProviders } from '../mock-providers'

tsconfig.json

@@ -5,7 +5,7 @@
     "jsx": "react-native",
     "module": "CommonJS",
     "moduleResolution": "node",
-    "types": ["react-native", "jest"],
+    "types": ["react-native", "jest", "typeorm"],
     "resolveJsonModule": true,
     "allowJs": true,
     "noEmit": true,
@@ -23,5 +23,8 @@
     "babel.config.js",
     "metro.config.js",
     "jest.config.js"
+  ],
+  "paths": [
+    "typeorm": ["./node_modules/typeorm"]
   ]
 }