Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .buildkite/jobs/pipeline.android_rn_79.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
- label: ":android: Android (RN 0.79.0)"
env:
JAVA_HOME: /opt/openjdk/jdk-17.0.9.jdk/Contents/Home/
REACT_NATIVE_VERSION: 0.79.0
command:
- "nvm install"
- "./scripts/ci.android.sh"
key: "android_rn_79"
timeout_in_minutes: 90
artifact_paths: "/Users/builder/uibuilder/work/playground/artifacts/**/*"



12 changes: 12 additions & 0 deletions .buildkite/jobs/pipeline.ios_rn_79.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- label: ":ios: iOS (RN 0.79.0)"
env:
REACT_NATIVE_VERSION: 0.79.0
command:
- "nvm install"
- "./scripts/ci.ios.sh"
key: "ios_rn_79"
timeout_in_minutes: 90
artifact_paths: "/Users/builder/uibuilder/work/playground/artifacts/**/*"



2 changes: 2 additions & 0 deletions .buildkite/pipeline.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ echo "steps:"
cat .buildkite/jobs/pipeline.release.yml
cat .buildkite/jobs/pipeline.android_rn_77.yml
cat .buildkite/jobs/pipeline.android_rn_78.yml
cat .buildkite/jobs/pipeline.android_rn_79.yml
cat .buildkite/jobs/pipeline.ios_rn_77.yml
cat .buildkite/jobs/pipeline.ios_rn_78.yml
cat .buildkite/jobs/pipeline.ios_rn_79.yml
cat .buildkite/jobs/pipeline.publish.yml


Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@ package com.reactnativenavigation
import com.facebook.react.ReactHost
import com.facebook.react.ReactNativeHost
import com.facebook.react.ReactPackage
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
import com.facebook.react.shell.MainReactPackage
import com.reactnativenavigation.NavigationPackage
import com.reactnativenavigation.react.NavigationReactNativeHost

class TestApplication : NavigationApplication() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import android.view.MotionEvent
import android.view.View
import android.view.ViewGroup
import androidx.annotation.VisibleForTesting
import com.facebook.react.views.debuggingoverlay.DebuggingOverlay
import com.reactnativenavigation.options.params.Bool
import com.reactnativenavigation.options.params.NullBool
import com.reactnativenavigation.react.ReactView
Expand Down Expand Up @@ -57,7 +56,19 @@ open class OverlayTouchDelegate(
return false
}

private fun debuggingOverlay(childItem: View?): Boolean =
childItem is ViewGroup && childItem.getChildAt(0) is DebuggingOverlay
private fun debuggingOverlay(childItem: View?): Boolean {
if (childItem !is ViewGroup) return false
val firstChild = childItem.getChildAt(0) ?: return false
return isDebuggingOverlay(firstChild)
}

private fun isDebuggingOverlay(view: View): Boolean {
return try {
val className = view.javaClass.name
className == "com.facebook.react.views.debuggingoverlay.DebuggingOverlay"
} catch (e: Exception) {
false
}
}

}

This file was deleted.

29 changes: 29 additions & 0 deletions android/src/test/java/com/reactnativenavigation/TestApplication.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package com.reactnativenavigation

import android.app.Application
import androidx.appcompat.R
import com.facebook.react.ReactApplication
import com.facebook.react.ReactHost
import com.facebook.react.ReactNativeHost
import com.facebook.react.ReactPackage
import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost

class TestApplication : Application(), ReactApplication {
override val reactNativeHost: ReactNativeHost = object : ReactNativeHost(this) {
override fun getUseDeveloperSupport(): Boolean {
return true
}

override fun getPackages(): MutableList<ReactPackage> {
return mutableListOf()
}
}

override fun onCreate() {
super.onCreate()
setTheme(R.style.Theme_AppCompat)
}

override val reactHost: ReactHost
get() = getDefaultReactHost(this, reactNativeHost)
}
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@
"@babel/preset-env": "^7.25.3",
"@babel/runtime": "^7.25.0",
"@babel/types": "7.25.0",
"@react-native-community/cli": "15.1.0",
"@react-native-community/cli-platform-android": "15.1.0",
"@react-native-community/cli-platform-ios": "15.1.0",
"@react-native-community/cli": "18.0.0",
"@react-native-community/cli-platform-android": "18.0.0",
"@react-native-community/cli-platform-ios": "18.0.0",
"@react-native-community/datetimepicker": "^8.2.0",
"@react-native-community/netinfo": "^11.4.1",
"@react-native/babel-preset": "0.78.3",
"@react-native/eslint-config": "0.78.3",
"@react-native/metro-config": "0.78.3",
"@react-native/typescript-config": "0.78.3",
"@react-native/babel-preset": "0.79.7",
"@react-native/eslint-config": "0.79.7",
"@react-native/metro-config": "0.79.7",
"@react-native/typescript-config": "0.79.7",
"@testing-library/jest-native": "^5.4.2",
"@testing-library/react-native": "^13.0.1",
"@types/hoist-non-react-statics": "^3.3.6",
Expand Down Expand Up @@ -124,7 +124,7 @@
"pngjs": "^6.0.0",
"prettier": "2.8.8",
"react": "19.0.0",
"react-native": "0.78.3",
"react-native": "0.79.7",
"react-native-builder-bob": "^0.40.13",
"react-native-fast-image": "^8.6.3",
"react-native-gesture-handler": "^2.22.1",
Expand Down Expand Up @@ -179,4 +179,4 @@
]
]
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class MainApplication : NavigationApplication(mapOf(
super.onCreate()
registerExternalComponent("RNNCustomComponent", FragmentCreator())
}

override val reactHost: ReactHost
get() = getDefaultReactHost(this, reactNativeHost)

}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Jul 28 13:48:47 IDT 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
16 changes: 8 additions & 8 deletions playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@
"@babel/preset-env": "^7.25.3",
"@babel/runtime": "^7.25.0",
"@babel/types": "7.25.0",
"@react-native-community/cli": "15.1.0",
"@react-native-community/cli-platform-android": "15.1.0",
"@react-native-community/cli-platform-ios": "15.1.0",
"@react-native-community/cli": "18.0.0",
"@react-native-community/cli-platform-android": "18.0.0",
"@react-native-community/cli-platform-ios": "18.0.0",
"@react-native-community/datetimepicker": "^8.2.0",
"@react-native-community/netinfo": "^11.4.1",
"@react-native/babel-preset": "0.78.3",
"@react-native/eslint-config": "0.78.3",
"@react-native/metro-config": "0.78.3",
"@react-native/typescript-config": "0.78.3",
"@react-native/babel-preset": "0.79.7",
"@react-native/eslint-config": "0.79.7",
"@react-native/metro-config": "0.79.7",
"@react-native/typescript-config": "0.79.7",
"@testing-library/jest-native": "^5.4.2",
"@testing-library/react-native": "^13.0.1",
"@types/hoist-non-react-statics": "^3.3.6",
Expand Down Expand Up @@ -68,7 +68,7 @@
"pngjs": "^6.0.0",
"prettier": "2.8.8",
"react": "19.0.0",
"react-native": "0.78.3",
"react-native": "0.79.7",
"react-native-fast-image": "^8.6.3",
"react-native-gesture-handler": "^2.22.1",
"react-native-monorepo-config": "^0.3.0",
Expand Down
1 change: 0 additions & 1 deletion scripts/ci.android.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ set -euo pipefail

# JS tests
yarn run test-js
yarn run test-autolink

# Android unit tests
yarn run test-unit-android -- --release
Expand Down
Loading
Loading