Merge pull request #30 from patrickkabwe/next

Next

Author: patrickkabwe

.github/dependabot.yml

@@ -1,44 +1,52 @@
 version: 2
-
+enable-beta-ecosystems: true
 updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
+  - package-ecosystem: 'github-actions'
+    directory: '/'
     schedule:
-      interval: "daily"
+      interval: 'daily'
     labels:
-      - "dependencies"
+      - 'dependencies'
 
-  - package-ecosystem: "gradle"
+  - package-ecosystem: 'gradle'
     directories:
-      - "/package/android/"
-      - "/example/android/"
+      - '/android/'
+      - '/example/android/'
+    schedule:
+      interval: 'daily'
+    labels:
+      - 'nitro-core'
+      - 'nitrogen'
+      - 'dependencies'
+      - 'kotlin'
+
+  - package-ecosystem: 'bundler'
+    directory: '/example/'
     schedule:
-      interval: "daily"
+      interval: 'daily'
     labels:
-      - "nitro-core"
-      - "nitrogen"
-      - "dependencies"
-      - "kotlin"
+      - 'dependencies'
+      - 'ruby'
 
-  - package-ecosystem: "npm"
+  - package-ecosystem: 'npm'
     directories:
-      - "/package/"
-      - "/example/"
+      - '/example/'
+      - '/'
     schedule:
-      interval: "daily"
+      interval: 'daily'
     labels:
-      - "nitro-core"
-      - "dependencies"
-      - "typescript"
-      - "nitrogen"
+      - 'nitro-core'
+      - 'dependencies'
+      - 'typescript'
+      - 'nitrogen'
 
     groups:
       react-native-cli:
         patterns:
-          - "@react-native-community/cli*"
+          - '@react-native-community/cli*'
       babel:
         patterns:
-          - "@babel/*"
+          - '@babel/*'
       react-native:
         patterns:
-          - "@react-native/*"
+          - '@react-native/*'

.github/workflows/android-build.yml

@@ -7,11 +7,11 @@ on:
     paths:
       - '.github/workflows/android-build.yml'
       - 'example/android/**'
-      - '**/nitrogen/generated/shared/**'
-      - '**/nitrogen/generated/android/**'
-      - 'react-native-nitro-in-app-browser/cpp/**'
-      - 'react-native-nitro-in-app-browser/android/**'
-      - '**/bun.lockb'
+      - 'nitrogen/generated/shared/**'
+      - 'nitrogen/generated/android/**'
+      - 'cpp/**'
+      - 'android/**'
+      - '**/bun.lock'
       - '**/react-native.config.js'
       - '**/nitro.json'
   pull_request:
@@ -20,12 +20,16 @@ on:
       - 'example/android/**'
       - '**/nitrogen/generated/shared/**'
       - '**/nitrogen/generated/android/**'
-      - 'react-native-nitro-in-app-browser/cpp/**'
-      - 'react-native-nitro-in-app-browser/android/**'
-      - '**/bun.lockb'
+      - 'cpp/**'
+      - 'android/**'
+      - '**/bun.lock'
       - '**/react-native.config.js'
       - '**/nitro.json'
 
+concurrency:
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
+
 jobs:
   build_new:
     name: Build Android Example App (new architecture)
@@ -43,20 +47,12 @@ jobs:
           distribution: 'zulu'
           java-version: 17
           java-package: jdk
+          cache: gradle
 
-      - name: Restore Gradle cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
       - name: Run Gradle Build for example/android/
         working-directory: example/android
         run: ./gradlew assembleDebug --no-daemon --build-cache
 
-      # Gradle cache doesn't like daemons
       - name: Stop Gradle Daemon
         working-directory: example/android
         run: ./gradlew --stop
@@ -80,20 +76,12 @@ jobs:
           distribution: 'zulu'
           java-version: 17
           java-package: jdk
+          cache: gradle
 
-      - name: Restore Gradle cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-          restore-keys: |
-            ${{ runner.os }}-gradle-
       - name: Run Gradle Build for example/android/
         working-directory: example/android
         run: ./gradlew assembleDebug --no-daemon --build-cache
 
-      # Gradle cache doesn't like daemons
       - name: Stop Gradle Daemon
         working-directory: example/android
-        run: ./gradlew --stop
+        run: ./gradlew --stop

.github/workflows/ios-build.yml

@@ -7,30 +7,40 @@ on:
     paths:
       - '.github/workflows/ios-build.yml'
       - 'example/ios/**'
+      - 'example/Gemfile'
+      - 'example/Gemfile.lock'
       - '**/nitrogen/generated/shared/**'
       - '**/nitrogen/generated/ios/**'
-      - 'react-native-nitro-in-app-browser/cpp/**'
-      - 'react-native-nitro-in-app-browser/ios/**'
+      - 'cpp/**'
+      - 'ios/**'
       - '**/Podfile.lock'
+      - '**/bun.lock'
       - '**/*.podspec'
       - '**/react-native.config.js'
       - '**/nitro.json'
   pull_request:
     paths:
       - '.github/workflows/ios-build.yml'
       - 'example/ios/**'
+      - 'example/Gemfile'
+      - 'example/Gemfile.lock'
       - '**/nitrogen/generated/shared/**'
       - '**/nitrogen/generated/ios/**'
-      - 'react-native-nitro-in-app-browser/cpp/**'
-      - 'react-native-nitro-in-app-browser/ios/**'
+      - 'cpp/**'
+      - 'ios/**'
       - '**/Podfile.lock'
+      - '**/bun.lock'
       - '**/*.podspec'
       - '**/react-native.config.js'
       - '**/nitro.json'
 
 env:
   USE_CCACHE: 1
 
+concurrency:
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
+    
 jobs:
   build_new:
     name: Build iOS Example App (new architecture)
@@ -42,9 +52,6 @@ jobs:
       - name: Install npm dependencies (bun)
         run: bun install
 
-      - name: Restore ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-
       - name: Setup Ruby (bundle)
         uses: ruby/setup-ruby@v1
         with:
@@ -70,8 +77,8 @@ jobs:
         run: "set -o pipefail && xcodebuild \
           CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ \
           -derivedDataPath build -UseModernBuildSystem=YES \
-          -workspace ExampleApp.xcworkspace \
-          -scheme ExampleApp \
+          -workspace NitroInAppBrowserExample.xcworkspace \
+          -scheme NitroInAppBrowserExample \
           -sdk iphonesimulator \
           -configuration Debug \
           -destination 'platform=iOS Simulator,name=iPhone 16' \
@@ -120,8 +127,8 @@ jobs:
         run: "set -o pipefail && xcodebuild \
           CC=clang CPLUSPLUS=clang++ LD=clang LDPLUSPLUS=clang++ \
           -derivedDataPath build -UseModernBuildSystem=YES \
-          -workspace ExampleApp.xcworkspace \
-          -scheme ExampleApp \
+          -workspace NitroInAppBrowserExample.xcworkspace \
+          -scheme NitroInAppBrowserExample \
           -sdk iphonesimulator \
           -configuration Debug \
           -destination 'platform=iOS Simulator,name=iPhone 16' \

.github/workflows/release-android.yml

@@ -0,0 +1,50 @@
+name: Release
+
+on:
+    push:
+      branches:
+        - main
+        - next
+
+permissions:
+  contents: read
+
+concurrency:
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      issues: write
+      pull-requests: write
+      id-token: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Setup Bun.js
+        uses: oven-sh/setup-bun@v2
+        with:
+          bun-version: latest
+      - name: Cache bun dependencies
+        id: bun-cache
+        uses: actions/cache@v4
+        with:
+            path: ~/.bun/install/cache
+            key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lockb') }}
+            restore-keys: |
+                ${{ runner.os }}-bun-
+        
+      - name: Install npm dependencies (bun)
+        run: bun install
+      - name: Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NPM_CONFIG_PROVENANCE: true
+        run: bun release

.github/workflows/release.yml

@@ -2,8 +2,6 @@
 #
 .DS_Store
 
-**/.xcode.env.local
-
 # XDE
 .expo/
 
@@ -56,10 +54,6 @@ npm-debug.log
 yarn-debug.log
 yarn-error.log
 
-# Bun
-package-lock.json
-**/*.bun
-
 # BUCK
 buck-out/
 \.buckd/
@@ -73,15 +67,11 @@ android/keystores/debug.keystore
 !.yarn/releases
 !.yarn/sdks
 !.yarn/versions
+.kotlin
 
 # Expo
 .expo/
 
-# Turborepo
-.turbo/
-
 # generated by bob
 lib/
-
-# TypeScript
 tsconfig.tsbuildinfo