Merge branch 'main' of github.com:callstack/react-native-brownfield into refactor/remove-expo54

Author: hurali97

.github/workflows/ci.yml

@@ -23,6 +23,7 @@ jobs:
       packages: ${{ steps.filter.outputs.packages }}
       rnapp: ${{ steps.filter.outputs.rnapp }}
       expo55: ${{ steps.filter.outputs.expo55 }}
+      expo56: ${{ steps.filter.outputs.expo56 }}
       androidapp: ${{ steps.filter.outputs.androidapp }}
       appleapp: ${{ steps.filter.outputs.appleapp }}
       ci: ${{ steps.filter.outputs.ci }}
@@ -43,6 +44,9 @@ jobs:
             expo55:
               - 'apps/ExpoApp55/**'
               - 'apps/brownfield-example-shared-tests/**'
+            expo56:
+              - 'apps/ExpoApp56/**'
+              - 'apps/brownfield-example-shared-tests/**'
             androidapp:
               - 'apps/AndroidApp/**'
             appleapp:
@@ -132,6 +136,7 @@ jobs:
       always() &&
       (
         needs.filter.outputs.expo55 == 'true' ||
+        needs.filter.outputs.expo56 == 'true' ||
         needs.filter.outputs.androidapp == 'true' ||
         needs.filter.outputs.packages == 'true' ||
         needs.filter.outputs.ci == 'true'
@@ -141,6 +146,7 @@ jobs:
       matrix:
         include:
           - version: '55'
+          - version: '56'
 
     steps:
       - name: Checkout
@@ -214,6 +220,7 @@ jobs:
       always() &&
       (
         needs.filter.outputs.expo55 == 'true' ||
+        needs.filter.outputs.expo56 == 'true' ||
         needs.filter.outputs.appleapp == 'true' ||
         needs.filter.outputs.packages == 'true' ||
         needs.filter.outputs.ci == 'true'
@@ -224,6 +231,8 @@ jobs:
         include:
           - version: '55'
             run-e2e: 'true'
+          - version: '56'
+            run-e2e: 'true'
 
     steps:
       - name: Checkout

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 _History prior to 3.7.0 is available in the per-package CHANGELOG files._
 
+## 3.15.0
+
+### Minor Changes
+
+- [#410](https://github.com/callstack/react-native-brownfield/pull/410) [`03c2496`](https://github.com/callstack/react-native-brownfield/commit/03c2496989fdafdc0863a97f01df9b7f5cd78a55) Thanks [@hurali97](https://github.com/hurali97)! - bump brownfield-gradle-plugin
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @callstack/brownfield-cli@3.15.0
+
+## 3.14.0
+
+### Minor Changes
+
+- [#360](https://github.com/callstack/react-native-brownfield/pull/360) [`10ff597`](https://github.com/callstack/react-native-brownfield/commit/10ff597c057c04aa093b4e5ae8c5334b169d3d56) Thanks [@adamTrz](https://github.com/adamTrz)! - Expo SDK 56 support
+
+### Patch Changes
+
+- Updated dependencies [[`10ff597`](https://github.com/callstack/react-native-brownfield/commit/10ff597c057c04aa093b4e5ae8c5334b169d3d56)]:
+  - @callstack/brownfield-cli@3.14.0
+
 ## 3.13.2
 
 ### Patch Changes

apps/AndroidApp/app/build.gradle.kts

@@ -33,6 +33,9 @@ android {
         create("expo55") {
             dimension = "app"
         }
+        create("expo56") {
+            dimension = "app"
+        }
         create("expobeta") {
             dimension = "app"
         }
@@ -73,6 +76,7 @@ dependencies {
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.appcompat)
     add("expo55Implementation", libs.brownfieldlib.expo55)
+    add("expo56Implementation", libs.brownfieldlib.expo56)
     add("expobetaImplementation", libs.brownfieldlib.expobeta)
     add("vanillaImplementation", libs.brownfieldlib.vanilla)
 

apps/AndroidApp/app/src/expo56/java/com/callstack/brownfield/android/expo/BrownfieldStore.kt

@@ -0,0 +1,4 @@
+package com.callstack.brownfield.android.example
+
+typealias BrownfieldStore = com.callstack.rnbrownfield.demo.expoapp56.BrownfieldStore
+typealias User = com.callstack.rnbrownfield.demo.expoapp56.User

apps/AndroidApp/app/src/expo56/java/com/callstack/brownfield/android/expo/ReactNativeConstants.kt

@@ -0,0 +1,6 @@
+package com.callstack.brownfield.android.example
+
+object ReactNativeConstants {
+    const val MAIN_MODULE_NAME = "main"
+    const val APP_NAME = "Android (Expo 56)"
+}

apps/AndroidApp/app/src/expo56/java/com/callstack/brownfield/android/expo/ReactNativeHostManager.kt

@@ -0,0 +1,3 @@
+package com.callstack.brownfield.android.example
+
+typealias ReactNativeHostManager = com.callstack.rnbrownfield.demo.expoapp56.ReactNativeHostManager

apps/AndroidApp/gradle/libs.versions.toml

@@ -16,6 +16,7 @@ gson = "2.13.2"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
+brownfieldlib-expo56 = { module = "com.callstack.rnbrownfield.demo.expoapp56:brownfieldlib", version.ref = "brownfieldlib" }
 brownfieldlib-expo55 = { module = "com.callstack.rnbrownfield.demo.expoapp55:brownfieldlib", version.ref = "brownfieldlib" }
 brownfieldlib-expobeta = { module = "com.callstack.rnbrownfield.demo.expobeta:brownfieldlib", version.ref = "brownfieldlib" }
 brownfieldlib-vanilla = { module = "com.rnapp:brownfieldlib", version.ref = "brownfieldlib" }
@@ -40,4 +41,3 @@ gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
-

apps/AndroidApp/package.json

@@ -3,7 +3,8 @@
   "version": "0.0.1",
   "private": true,
   "scripts": {
-    "build:example:android-consumer:expo": "./gradlew assembleExpo55Release",
+    "build:example:android-consumer:expo": "./gradlew assembleExpo56Release",
+    "build:example:android-consumer:expo56": "./gradlew assembleExpo56Release",
     "build:example:android-consumer:expo55": "./gradlew assembleExpo55Release",
     "build:example:android-consumer:expobeta": "./gradlew assembleExpobetaRelease",
     "build:example:android-consumer:vanilla": "./gradlew assembleVanillaRelease"

apps/AppleApp/.detoxrc.expo56.cjs

@@ -0,0 +1,17 @@
+const {
+  createAppleAppIosSimDebugDetoxConfig,
+} = require('../brownfield-example-shared-tests/detox-rc-appleapp-ios-sim-debug.cjs');
+const {
+  getAppleAppDetoxVariant,
+} = require('../brownfield-example-shared-tests/detox-appleapp-variants.cjs');
+
+const variant = getAppleAppDetoxVariant('expo56');
+
+/** @type {import('detox').DetoxConfig} */
+module.exports = createAppleAppIosSimDebugDetoxConfig({
+  scheme: variant.scheme,
+  configuration: variant.configuration,
+  appBinaryName: variant.appBinaryName,
+  detoxConfiguration: variant.detoxConfiguration,
+  jestConfigPath: 'e2e/jest.config.expo56.cjs',
+});