Skip to content

Commit

Permalink
merge with main
Browse files Browse the repository at this point in the history
:
  • Loading branch information
kaylytran committed Apr 22, 2024
2 parents 15b9486 + 5909c31 commit 7aa34a9
Show file tree
Hide file tree
Showing 576 changed files with 6,421 additions and 2,919 deletions.
77 changes: 77 additions & 0 deletions .detoxrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
/** @type {Detox.DetoxConfig} */
module.exports = {
logger: {
level: process.env.CI ? 'debug' : undefined,
},
testRunner: {
$0: 'jest',
args: {
config: 'e2e/jest.config.js',
_: ['e2e'],
},
},
artifacts: {
plugins: {
log: process.env.CI ? 'failing' : undefined,
screenshot: 'failing',
},
},
apps: {
'ios.debug': {
type: 'ios.app',
build:
'xcodebuild -workspace ios/eastestsexample.xcworkspace -scheme eastestsexample -configuration Debug -sdk iphonesimulator -arch x86_64 -derivedDataPath ios/build',
binaryPath: 'ios/build/Build/Products/Debug-iphonesimulator/eastestsexample.app',
},
'ios.release': {
type: 'ios.app',
build:
'xcodebuild -workspace ios/eastestsexample.xcworkspace -scheme eastestsexample -configuration Release -sdk iphonesimulator -arch x86_64 -derivedDataPath ios/build',
binaryPath: 'ios/build/Build/Products/Release-iphonesimulator/eastestsexample.app',
},
'android.debug': {
type: 'android.apk',
build:
'cd android && gradlew :app:assembleDebug :app:assembleAndroidTest -DtestBuildType=debug && cd ..',
binaryPath: 'android/app/build/outputs/apk/debug/app-debug.apk',
},
'android.release': {
type: 'android.apk',
build:
'cd android && gradlew :app:assembleRelease :app:assembleAndroidTest -DtestBuildType=release && cd ..',
binaryPath: 'android/app/build/outputs/apk/release/app-release.apk',
},
},
devices: {
simulator: {
type: 'ios.simulator',
device: {
type: 'iPhone 14',
},
},
emulator: {
type: 'android.emulator',
device: {
avdName: 'Pixel_7_API_33',
},
},
},
configurations: {
'ios.debug': {
device: 'simulator',
app: 'ios.debug',
},
'ios.release': {
device: 'simulator',
app: 'ios.release',
},
'android.debug': {
device: 'emulator',
app: 'android.debug',
},
'android.release': {
device: 'emulator',
app: 'android.release',
},
},
};
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ node_modules/
dist/
web-build/

#pre-build folders
android
ios

# Native
*.orig.*
*.jks
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"git.ignoreLimitWarning": true,
"java.configuration.updateBuildConfiguration": "interactive"
"java.configuration.updateBuildConfiguration": "interactive",
"java.compile.nullAnalysis.mode": "automatic"
}
370 changes: 370 additions & 0 deletions Pixel_7_API_33-15390.log

Large diffs are not rendered by default.

15 changes: 0 additions & 15 deletions android/.gitignore

This file was deleted.

176 changes: 0 additions & 176 deletions android/app/build.gradle

This file was deleted.

Binary file removed android/app/debug.keystore
Binary file not shown.
14 changes: 0 additions & 14 deletions android/app/proguard-rules.pro

This file was deleted.

7 changes: 0 additions & 7 deletions android/app/src/debug/AndroidManifest.xml

This file was deleted.

33 changes: 0 additions & 33 deletions android/app/src/main/AndroidManifest.xml

This file was deleted.

Loading

0 comments on commit 7aa34a9

Please sign in to comment.