Merge branch 'main' into @jfedak/macos-rotation-velocity

software-mansion · Feb 8, 2024 · 54243d9 · 54243d9
2 parents 8954f04 + 2e5df1c
commit 54243d9
Show file tree

Hide file tree

Showing 70 changed files with 1,595 additions and 1,294 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -12,7 +12,11 @@
   },
   "parser": "@typescript-eslint/parser",
   "parserOptions": {
-    "project": ["./tsconfig.json", "./example/tsconfig.json", "./FabricExample/tsconfig.json"]
+    "project": [
+      "./tsconfig.json",
+      "./example/tsconfig.json",
+      "./FabricExample/tsconfig.json"
+    ]
   },
   "env": { "browser": true, "node": true, "jest/globals": true },
   "plugins": ["jest"],
@@ -32,6 +36,7 @@
     "@typescript-eslint/no-unsafe-call": "warn",
     "@typescript-eslint/no-unsafe-assignment": "warn",
     "@typescript-eslint/no-unsafe-return": "warn",
+    "@typescript-eslint/ban-types": "warn",
 
     // common
     "@typescript-eslint/explicit-module-boundary-types": "off",

diff --git a/.github/workflows/ios-build.yml b/.github/workflows/ios-build.yml
@@ -37,4 +37,4 @@ jobs:
         run: pod install
       - name: Build app
         working-directory: ${{ matrix.working-directory }}
-        run: yarn ios --simulator=\"iPhone 11\" --mode Debug
+        run: yarn ios --simulator=\"iPhone 14\" --mode Debug --verbose --terminal /bin/zsh
diff --git a/FabricExample/android/app/src/main/java/com/fabricexample/MainApplication.kt b/FabricExample/android/app/src/main/java/com/fabricexample/MainApplication.kt
@@ -16,11 +16,11 @@ class MainApplication : Application(), ReactApplication {
 
     override val reactNativeHost: ReactNativeHost =
         object : DefaultReactNativeHost(this) {
-            override fun getPackages(): List<ReactPackage> {
-                // Packages that cannot be autolinked yet can be added manually here, for example:
-                // packages.add(new MyReactNativePackage());
-                return PackageList(this).packages
-            }
+            override fun getPackages(): List<ReactPackage> =
+                PackageList(this).packages.apply {
+                    // Packages that cannot be autolinked yet can be added manually here, for example:
+                    // add(MyReactNativePackage())
+                }
 
             override fun getJSMainModuleName(): String = "index"
 

diff --git a/FabricExample/android/build.gradle b/FabricExample/android/build.gradle
@@ -19,3 +19,5 @@ buildscript {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
     }
 }
+
+apply plugin: "com.facebook.react.rootproject"
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,3 +19,5 @@ buildscript { @@
             classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
         }
     }
+    apply plugin: "com.facebook.react.rootproject"