Skip to content
Draft
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
2 changes: 1 addition & 1 deletion .github/workflows/e2e-harness-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
jobs:
e2e-harness-android:
if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-harness-android' || github.event.label.name == 'e2e' }}
runs-on: [self-hosted, macos, ARM64]
runs-on: [self-hosted, macos]
steps:
- uses: actions/checkout@v2
- name: Setup
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-harness-androidtv.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
jobs:
e2e-harness-androidtv:
if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-harness-androidtv' || github.event.label.name == 'e2e' }}
runs-on: [self-hosted, macos, ARM64]
runs-on: [self-hosted, macos]
steps:
- uses: actions/checkout@v2
- name: Setup
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-harness-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
jobs:
e2e-harness-ios:
if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-harness-ios' || github.event.label.name == 'e2e' }}
runs-on: [self-hosted, macos, ARM64]
runs-on: [self-hosted, macos]
steps:
- uses: actions/checkout@v2
- name: Setup
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-template-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
jobs:
e2e-template-ios:
if: ${{ github.event_name == 'workflow_dispatch' || github.event_name == 'push' || github.event.label.name == 'e2e-template-ios' || github.event.label.name == 'e2e' }}
runs-on: [self-hosted, macos, ARM64]
runs-on: [self-hosted, macos]
steps:
- uses: actions/checkout@v2
- name: Setup
Expand Down
37 changes: 33 additions & 4 deletions packages/app-harness/wdio.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,22 @@
const deviceTarget = process.env.DEVICE_TARGET;

if (deviceTarget) {
console.log(`Using custom device target: ${deviceTarget}`);

Check warning on line 13 in packages/app-harness/wdio.conf.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Unexpected console statement

Check warning on line 13 in packages/app-harness/wdio.conf.js

View workflow job for this annotation

GitHub Actions / build (22.x)

Unexpected console statement
}

// Verify app exists before setting capabilities
const verifyAppPath = (appPath, platform) => {
console.log(`\n🔍 Checking app path for ${platform}...`);

Check warning on line 18 in packages/app-harness/wdio.conf.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Unexpected console statement

Check warning on line 18 in packages/app-harness/wdio.conf.js

View workflow job for this annotation

GitHub Actions / build (22.x)

Unexpected console statement
console.log(` Path: ${appPath}`);

Check warning on line 19 in packages/app-harness/wdio.conf.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Unexpected console statement

Check warning on line 19 in packages/app-harness/wdio.conf.js

View workflow job for this annotation

GitHub Actions / build (22.x)

Unexpected console statement
if (!fs.existsSync(appPath)) {
console.warn(`⚠️ App not found at: ${appPath}`);

Check warning on line 21 in packages/app-harness/wdio.conf.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Unexpected console statement

Check warning on line 21 in packages/app-harness/wdio.conf.js

View workflow job for this annotation

GitHub Actions / build (22.x)

Unexpected console statement
console.warn(` Make sure you've built the app first: yarn build:${platform}-test`);

Check warning on line 22 in packages/app-harness/wdio.conf.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Unexpected console statement

Check warning on line 22 in packages/app-harness/wdio.conf.js

View workflow job for this annotation

GitHub Actions / build (22.x)

Unexpected console statement
return false;
}
console.log(`✅ App found!`);

Check warning on line 25 in packages/app-harness/wdio.conf.js

View workflow job for this annotation

GitHub Actions / build (20.x)

Unexpected console statement

Check warning on line 25 in packages/app-harness/wdio.conf.js

View workflow job for this annotation

GitHub Actions / build (22.x)

Unexpected console statement
return true;
};

const capabilities = {
ios: [
{
Expand All @@ -21,7 +34,14 @@
'appium:platformVersion': '16.4',
'appium:automationName': 'XCUITest',
'appium:bundleId': 'renative.harness.test',
'appium:app': 'platformBuilds/harness_ios/build/RNVApp/Build/Products/Release-iphonesimulator/RNVApp.app',
'appium:app': (() => {
const appPath = path.resolve(
__dirname,
'platformBuilds/harness_ios/build/RNVApp/Build/Products/Release-iphonesimulator/RNVApp.app'
);
verifyAppPath(appPath, 'ios');
return appPath;
})(),
'appium:fullReset': true,
},
],
Expand All @@ -32,8 +52,14 @@
'appium:platformVersion': '16.4',
'appium:automationName': 'XCUITest',
'appium:bundleId': 'renative.harness.test',
'appium:app':
'platformBuilds/harness_tvos/build/RNVApp/Build/Products/Release-appletvsimulator/RNVApp-tvOS.app',
'appium:app': (() => {
const appPath = path.resolve(
__dirname,
'platformBuilds/harness_tvos/build/RNVApp/Build/Products/Release-appletvsimulator/RNVApp-tvOS.app'
);
verifyAppPath(appPath, 'tvos');
return appPath;
})(),
'appium:fullReset': true,
},
],
Expand Down Expand Up @@ -145,7 +171,7 @@
// Define all options that are relevant for the WebdriverIO instance here
//
// Level of logging verbosity: trace | debug | info | warn | error | silent
logLevel: 'info',
logLevel: 'debug',
//
// Set specific log levels per logger
// loggers:
Expand Down Expand Up @@ -196,6 +222,7 @@
[
'appium',
{
logPath: './reporting/',
args: {
...(process.env.PLATFORM === 'ios' && {
port: 3001,
Expand All @@ -209,6 +236,8 @@
...(process.env.PLATFORM === 'androidtv' && {
port: 3004,
}),
relaxedSecurity: true,
log: './reporting/appium.log',
},
},
],
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/schema/platforms/fragments/android.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const zodPlatformAndroidFragment = z
.describe(
'Allows you define custom compileSdkVersion equivalent to: `compileSdkVersion = [VERSION]` in build.gradle'
),
kotlinVersion: z.string().default('1.7.10').describe('Allows you define custom kotlin version'),
kotlinVersion: z.string().default('2.0.21').describe('Allows you define custom kotlin version'),
ndkVersion: z
.string()
.describe('Allows you define custom ndkVersion equivalent to: `ndkVersion = [VERSION]` in build.gradle'),
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk-android/src/gradleParser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ export const parseAppBuildGradleSync = () => {
c.payload.pluginConfigAndroid.gradleBuildToolsVersion = getConfigProp('gradleBuildToolsVersion') || '4.2.2';
c.payload.pluginConfigAndroid.supportLibVersion = getConfigProp('supportLibVersion') || '28.0.0';
c.payload.pluginConfigAndroid.buildToolsVersion = getConfigProp('buildToolsVersion') || '35.0.0';
c.payload.pluginConfigAndroid.kotlinVersion = getConfigProp('kotlinVersion') || '1.9.24';
c.payload.pluginConfigAndroid.kotlinVersion = getConfigProp('kotlinVersion') || '2.0.21';
c.payload.pluginConfigAndroid.googleServicesVersion = getConfigProp('googleServicesVersion') || '4.2.0';

const reactNativeEngine = getConfigProp('reactNativeEngine') || 'hermes';
Expand Down
2 changes: 1 addition & 1 deletion packages/template-starter/renative.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"gradleBuildToolsVersion": "4.2.2",
"gradleWrapperVersion": "8.10.2",
"ndkVersion": "26.1.10909125",
"kotlinVersion": "1.9.24",
"kotlinVersion": "2.0.21",
"reactNativeEngine": "hermes",
"enableAndroidX": true,
"newArchEnabled": true,
Expand Down
44 changes: 39 additions & 5 deletions packages/template-starter/wdio.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,19 @@ if (deviceTarget) {
console.log(`Using custom device target: ${deviceTarget}`);
}

// Verify app exists before setting capabilities
const verifyAppPath = (appPath, platform) => {
console.log(`\n🔍 Checking app path for ${platform}...`);
console.log(` Path: ${appPath}`);
if (!fs.existsSync(appPath)) {
console.warn(`⚠️ App not found at: ${appPath}`);
console.warn(` Make sure you've built the app first: yarn build:${platform}-test`);
return false;
}
console.log(`✅ App found!`);
return true;
};

const capabilities = {
ios: [
{
Expand All @@ -21,7 +34,14 @@ const capabilities = {
'appium:platformVersion': '16.4',
'appium:automationName': 'XCUITest',
'appium:bundleId': 'renative.helloworld.test',
'appium:app': 'platformBuilds/template_ios/build/RNVApp/Build/Products/Release-iphonesimulator/RNVApp.app',
'appium:app': (() => {
const appPath = path.resolve(
__dirname,
'platformBuilds/template_ios/build/RNVApp/Build/Products/Release-iphonesimulator/RNVApp.app'
);
verifyAppPath(appPath, 'ios');
return appPath;
})(),
'appium:fullReset': true,
},
],
Expand All @@ -32,8 +52,14 @@ const capabilities = {
'appium:platformVersion': '16.4',
'appium:automationName': 'XCUITest',
'appium:bundleId': 'renative.helloworld.test',
'appium:app':
'platformBuilds/template_tvos/build/RNVApp/Build/Products/Release-appletvsimulator/RNVApp-tvOS.app',
'appium:app': (() => {
const appPath = path.resolve(
__dirname,
'platformBuilds/template_tvos/build/RNVApp/Build/Products/Release-appletvsimulator/RNVApp-tvOS.app'
);
verifyAppPath(appPath, 'tvos');
return appPath;
})(),
'appium:fullReset': true,
},
],
Expand All @@ -45,7 +71,11 @@ const capabilities = {
'appium:automationName': 'UiAutomator2',
'appium:appPackage': 'renative.helloworld.test',
'appium:appActivity': 'renative.helloworld.test.MainActivity',
'appium:app': 'platformBuilds/template_android/app/build/outputs/apk/release/app-release.apk',
'appium:app': (() => {
const appPath = path.resolve(__dirname, 'platformBuilds/template_android/app/build/outputs/apk/release/app-release.apk');
verifyAppPath(appPath, 'android');
return appPath;
})(),
'appium:fullReset': true,
},
],
Expand All @@ -57,7 +87,11 @@ const capabilities = {
'appium:automationName': 'UiAutomator2',
'appium:appPackage': 'renative.helloworld.test',
'appium:appActivity': 'renative.helloworld.test.MainActivity',
'appium:app': 'platformBuilds/template_androidtv/app/build/outputs/apk/release/app-release.apk',
'appium:app': (() => {
const appPath = path.resolve(__dirname, 'platformBuilds/template_androidtv/app/build/outputs/apk/release/app-release.apk');
verifyAppPath(appPath, 'androidtv');
return appPath;
})(),
'appium:fullReset': true,
},
],
Expand Down
Loading