diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dd5c9eb..19e03b4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,7 +48,7 @@ jobs: channel: 'stable' - name: Run flutter test run: flutter test - working-directory: test_shard/integration_test_app + working-directory: tests/integration_test_app # pub_publish_check: # name: pub publish check diff --git a/.gitignore b/.gitignore index 1a96b6a..346365d 100644 --- a/.gitignore +++ b/.gitignore @@ -33,4 +33,5 @@ build/ # FVM Version Cache .fvm/ .vscode -.fvmrc \ No newline at end of file +.fvmrc +artifacts \ No newline at end of file diff --git a/scripts/build-iris.sh b/scripts/build-iris.sh index 652752b..85d899c 100644 --- a/scripts/build-iris.sh +++ b/scripts/build-iris.sh @@ -29,7 +29,7 @@ build_android() { cp -RP "${IRIS_OUTPUT}/$ABI/libAgoraRtmWrapper.so" \ "$AGORA_FLUTTER_PROJECT_PATH/android/libs/$ABI/libAgoraRtmWrapper.so" - cp -RP "${IRIS_OUTPUT}/$ABI/libIrisDebugger.so" "$AGORA_FLUTTER_PROJECT_PATH/test_shard/iris_tester/android/libs/$ABI/libIrisDebugger.so" + cp -RP "${IRIS_OUTPUT}/$ABI/libIrisDebugger.so" "$AGORA_FLUTTER_PROJECT_PATH/tests/iris_tester/android/libs/$ABI/libIrisDebugger.so" done; diff --git a/scripts/download_unzip_iris_cdn_artifacts.sh b/scripts/download_unzip_iris_cdn_artifacts.sh index 9d1482e..7d1c0bf 100644 --- a/scripts/download_unzip_iris_cdn_artifacts.sh +++ b/scripts/download_unzip_iris_cdn_artifacts.sh @@ -11,7 +11,7 @@ MY_PATH=$(dirname "$0") ARTIFACTS_PATH="${MY_PATH}/../artifacts" mkdir -p ${ARTIFACTS_PATH} -IRIS_TESTER_PATH=${MY_PATH}/../test_shard/iris_tester +IRIS_TESTER_PATH=${MY_PATH}/../tests/iris_tester DOWNLOAD_NAME=${CDN_URL##*/} diff --git a/scripts/ffi_gen/run_ffi_gen.sh b/scripts/ffi_gen/run_ffi_gen.sh index 44ea832..5a59276 100644 --- a/scripts/ffi_gen/run_ffi_gen.sh +++ b/scripts/ffi_gen/run_ffi_gen.sh @@ -25,4 +25,4 @@ popd rm -rf ${TMP_FFI_GEN_INCLUDE_DIR_NAME} -bash ${PROJECT_ROOT}/test_shard/iris_tester/ffigen.sh ${IRIS_PATH} \ No newline at end of file +bash ${PROJECT_ROOT}/tests/iris_tester/ffigen.sh ${IRIS_PATH} \ No newline at end of file diff --git a/scripts/flutter-build-runner.sh b/scripts/flutter-build-runner.sh index 63594aa..17b33c5 100644 --- a/scripts/flutter-build-runner.sh +++ b/scripts/flutter-build-runner.sh @@ -18,7 +18,7 @@ flutter packages pub run build_runner build --delete-conflicting-outputs popd -pushd ${AGORA_FLUTTER_PROJECT_PATH}/test_shard/integration_test_app +pushd ${AGORA_FLUTTER_PROJECT_PATH}/tests/integration_test_app rm -rf $AGORA_FLUTTER_PROJECT_PATH/example/macos/Flutter/ephemeral rm -rf $AGORA_FLUTTER_PROJECT_PATH/example/windows/Flutter/ephemeral diff --git a/scripts/run_flutter_integration_test.sh b/scripts/run_flutter_integration_test.sh index d6833ef..97a9e0e 100644 --- a/scripts/run_flutter_integration_test.sh +++ b/scripts/run_flutter_integration_test.sh @@ -8,7 +8,7 @@ PROJECT_ROOT=$(realpath ${MY_PATH}/..) PLATFORM=$1 # android/ios/macos/windows/web if [[ ${PLATFORM} == "web" ]];then - pushd ${PROJECT_ROOT}/test_shard/fake_test_app + pushd ${PROJECT_ROOT}/tests/fake_test_app IRIS_WEB_VERSION_PATH=${PROJECT_ROOT}/scripts/iris_web_version.js rm -rf web/iris_web_version.js @@ -46,7 +46,7 @@ elif [[ ${PLATFORM} == "android" || ${PLATFORM} == "ios" ]];then fi fi - pushd ${MY_PATH}/../test_shard/integration_test_app + pushd ${MY_PATH}/../tests/integration_test_app flutter packages get diff --git a/scripts/terra/renderers/event_ids_mapping_renderer.ts b/scripts/terra/renderers/event_ids_mapping_renderer.ts index 7f8453b..916f940 100644 --- a/scripts/terra/renderers/event_ids_mapping_renderer.ts +++ b/scripts/terra/renderers/event_ids_mapping_renderer.ts @@ -65,9 +65,9 @@ const eventIdsMapping = { return [ { - // test_shard/integration_test_app/integration_test/generated/bindings + // tests/integration_test_app/integration_test/generated/bindings file_name: - "test_shard/integration_test_app/integration_test/generated/bindings/event_ids_mapping_gen.dart", + "tests/integration_test_app/integration_test/generated/bindings/event_ids_mapping_gen.dart", file_content: output, }, ]; diff --git a/scripts/testcase_gen/build.sh b/scripts/testcase_gen/build.sh index 215bb3a..e4787ee 100644 --- a/scripts/testcase_gen/build.sh +++ b/scripts/testcase_gen/build.sh @@ -10,6 +10,6 @@ dart pub get popd dart run ${MY_PATH}/bin/testcase_gen.dart \ - --gen-integration-test --output-dir=${PROJECT_ROOT}/test_shard/integration_test_app + --gen-integration-test --output-dir=${PROJECT_ROOT}/tests/integration_test_app dart format . diff --git a/test_shard/integration_test_app/.metadata b/test_shard/integration_test_app/.metadata deleted file mode 100644 index b606793..0000000 --- a/test_shard/integration_test_app/.metadata +++ /dev/null @@ -1,42 +0,0 @@ -# This file tracks properties of this Flutter project. -# Used by Flutter tool to assess capabilities and perform upgrades etc. -# -# This file should be version controlled. - -version: - revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 - channel: stable - -project_type: app - -# Tracks metadata for the flutter migrate command -migration: - platforms: - - platform: root - create_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 - base_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 - - platform: android - create_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 - base_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 - - platform: ios - create_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 - base_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 - - platform: macos - create_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 - base_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 - - platform: web - create_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 - base_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 - - platform: windows - create_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 - base_revision: fb57da5f945d02ef4f98dfd9409a72b7cce74268 - - # User provided section - - # List of Local paths (relative to this file) that should be - # ignored by the migrate tool. - # - # Files that are not part of the templates will be ignored by default. - unmanaged_files: - - 'lib/main.dart' - - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/test_shard/integration_test_app/README.md b/test_shard/integration_test_app/README.md deleted file mode 100644 index 8d5f0df..0000000 --- a/test_shard/integration_test_app/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# integration_test_app - -Integration test cases. \ No newline at end of file diff --git a/test_shard/integration_test_app/android/app/build.gradle b/test_shard/integration_test_app/android/app/build.gradle deleted file mode 100644 index b5d21dc..0000000 --- a/test_shard/integration_test_app/android/app/build.gradle +++ /dev/null @@ -1,74 +0,0 @@ -def localProperties = new Properties() -def localPropertiesFile = rootProject.file('local.properties') -if (localPropertiesFile.exists()) { - localPropertiesFile.withReader('UTF-8') { reader -> - localProperties.load(reader) - } -} - -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') -if (flutterVersionCode == null) { - flutterVersionCode = '1' -} - -def flutterVersionName = localProperties.getProperty('flutter.versionName') -if (flutterVersionName == null) { - flutterVersionName = '1.0' -} - -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - -android { - compileSdkVersion 34 - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = '1.8' - } - - sourceSets { - main.java.srcDirs += 'src/main/kotlin' - } - - defaultConfig { - // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "io.agora.integration_test_app.integration_test_app" - // You can update the following values to match your application needs. - // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. - minSdkVersion 21 - targetSdkVersion flutter.targetSdkVersion - versionCode flutterVersionCode.toInteger() - versionName flutterVersionName - } - - buildTypes { - release { - // TODO: Add your own signing config for the release build. - // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.debug - } - } -} - -flutter { - source '../..' -} - -dependencies { - def devFile = project.file("${rootProject.projectDir.getParentFile().parentFile.parentFile}/android/.plugin_dev") - if (devFile.exists()) { - implementation fileTree(dir: "${rootProject.projectDir.getParentFile().parentFile.parentFile}/android/libs", include: ["*.aar"]) - } - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" -} diff --git a/test_shard/integration_test_app/android/app/src/main/kotlin/io/agora/integration_test_app/integration_test_app/MainActivity.kt b/test_shard/integration_test_app/android/app/src/main/kotlin/io/agora/integration_test_app/integration_test_app/MainActivity.kt deleted file mode 100644 index dc7556c..0000000 --- a/test_shard/integration_test_app/android/app/src/main/kotlin/io/agora/integration_test_app/integration_test_app/MainActivity.kt +++ /dev/null @@ -1,6 +0,0 @@ -package io.agora.integration_test_app.integration_test_app - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity: FlutterActivity() { -} diff --git a/test_shard/integration_test_app/android/build.gradle b/test_shard/integration_test_app/android/build.gradle deleted file mode 100644 index 6617c1e..0000000 --- a/test_shard/integration_test_app/android/build.gradle +++ /dev/null @@ -1,31 +0,0 @@ -buildscript { - ext.kotlin_version = '1.7.0' - repositories { - google() - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:7.1.2' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } -} - -allprojects { - repositories { - google() - mavenCentral() - } -} - -rootProject.buildDir = '../build' -subprojects { - project.buildDir = "${rootProject.buildDir}/${project.name}" -} -subprojects { - project.evaluationDependsOn(':app') -} - -tasks.register("clean", Delete) { - delete rootProject.buildDir -} diff --git a/test_shard/integration_test_app/assets/Agora.io-Interactions.mp3 b/test_shard/integration_test_app/assets/Agora.io-Interactions.mp3 deleted file mode 100644 index 337cdeb..0000000 Binary files a/test_shard/integration_test_app/assets/Agora.io-Interactions.mp3 and /dev/null differ diff --git a/test_shard/integration_test_app/assets/agora-logo.png b/test_shard/integration_test_app/assets/agora-logo.png deleted file mode 100644 index 0b93e8b..0000000 Binary files a/test_shard/integration_test_app/assets/agora-logo.png and /dev/null differ diff --git a/test_shard/integration_test_app/ios/Runner/AppDelegate.swift b/test_shard/integration_test_app/ios/Runner/AppDelegate.swift deleted file mode 100644 index 70693e4..0000000 --- a/test_shard/integration_test_app/ios/Runner/AppDelegate.swift +++ /dev/null @@ -1,13 +0,0 @@ -import UIKit -import Flutter - -@UIApplicationMain -@objc class AppDelegate: FlutterAppDelegate { - override func application( - _ application: UIApplication, - didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? - ) -> Bool { - GeneratedPluginRegistrant.register(with: self) - return super.application(application, didFinishLaunchingWithOptions: launchOptions) - } -} diff --git a/test_shard/integration_test_app/ios/Runner/Runner-Bridging-Header.h b/test_shard/integration_test_app/ios/Runner/Runner-Bridging-Header.h deleted file mode 100644 index 308a2a5..0000000 --- a/test_shard/integration_test_app/ios/Runner/Runner-Bridging-Header.h +++ /dev/null @@ -1 +0,0 @@ -#import "GeneratedPluginRegistrant.h" diff --git a/test_shard/integration_test_app/lib/main.dart b/test_shard/integration_test_app/lib/main.dart deleted file mode 100644 index 6b404a0..0000000 --- a/test_shard/integration_test_app/lib/main.dart +++ /dev/null @@ -1,90 +0,0 @@ -import 'package:flutter/material.dart'; -import 'dart:async'; - -import 'package:flutter_test/flutter_test.dart'; - -import 'package:agora_rtm/src/method_channel/iris_method_channel.dart'; -import 'package:iris_tester/iris_tester.dart'; - -class TestInitilizationArgProvider implements InitilizationArgProvider { - TestInitilizationArgProvider(this.testerArgs); - TestInitilizationArgProvider.fromValue(IrisHandle this.value) - : testerArgs = []; - final List testerArgs; - IrisHandle? value; - @override - IrisHandle provide(IrisApiEngineHandle apiEngineHandle) { - return value ?? ObjectIrisHandle(testerArgs[0](apiEngineHandle())); - } -} - -void main() { - runApp(const MyApp()); -} - -class MyApp extends StatefulWidget { - const MyApp({Key? key}) : super(key: key); - - @override - State createState() => _MyAppState(); -} - -class _MyAppState extends State { - @override - void initState() { - super.initState(); - initPlatformState(); - } - - // Platform messages are asynchronous, so we initialize in an async method. - Future initPlatformState() async { - // List irisMethodChannelInitilizationArgs = []; - // IrisTester? irisTester; - // irisTester = createIrisTester(); - // irisTester!.initialize(); - // if (kIsWeb) { - // rtm_client_impl_override.setMockSharedNativeHandleProvider( - // TestInitilizationArgProvider(irisTester!.getTesterArgs())); - // } else { - // // On IO, the function return from the `irisTester.getTesterArgs()` capture - // // the `Pointer` from `IrisTester`, which is invalid to pass to the `Isolate`, - // // so directly pass the `ObjectIrisHandle` as value to the `setMockSharedNativeHandleProvider` - // final value = - // irisTester!.getTesterArgs()[0](const IrisApiEngineHandle(0)); - // // rtm_client_impl_override.setMockSharedNativeHandleProvider( - // // TestInitilizationArgProvider.fromValue(ObjectIrisHandle(value))); - - // irisMethodChannelInitilizationArgs = [ - // TestInitilizationArgProvider.fromValue(ObjectIrisHandle(value)) - // ]; - // } - - // Future _createBindingRtmClient() async { - // String appId = const String.fromEnvironment('TEST_APP_ID', - // defaultValue: ''); - // final rtmResultHandler = RtmResultHandlerImpl(); - // return RtmClientImplOverride.create( - // IrisMethodChannel(IrisApiEngineNativeBindingDelegateProvider()), - // RtmConfig(appId: appId), - // rtmResultHandler.rtmEventHandler, - // args: irisMethodChannelInitilizationArgs, - // ); - // } - - // await _createBindingRtmClient(); - } - - @override - Widget build(BuildContext context) { - return MaterialApp( - home: Scaffold( - appBar: AppBar( - title: const Text('Plugin example app'), - ), - body: Center( - child: Text('Running on:\n'), - ), - ), - ); - } -} diff --git a/test_shard/iris_tester/example/android/gradle.properties b/test_shard/iris_tester/example/android/gradle.properties deleted file mode 100644 index 94adc3a..0000000 --- a/test_shard/iris_tester/example/android/gradle.properties +++ /dev/null @@ -1,3 +0,0 @@ -org.gradle.jvmargs=-Xmx1536M -android.useAndroidX=true -android.enableJetifier=true diff --git a/test_shard/iris_tester/example/android/settings.gradle b/test_shard/iris_tester/example/android/settings.gradle deleted file mode 100644 index 44e62bc..0000000 --- a/test_shard/iris_tester/example/android/settings.gradle +++ /dev/null @@ -1,11 +0,0 @@ -include ':app' - -def localPropertiesFile = new File(rootProject.projectDir, "local.properties") -def properties = new Properties() - -assert localPropertiesFile.exists() -localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } - -def flutterSdkPath = properties.getProperty("flutter.sdk") -assert flutterSdkPath != null, "flutter.sdk not set in local.properties" -apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png deleted file mode 100644 index 28c6bf0..0000000 Binary files a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ diff --git a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png deleted file mode 100644 index 2ccbfd9..0000000 Binary files a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and /dev/null differ diff --git a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png deleted file mode 100644 index f091b6b..0000000 Binary files a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and /dev/null differ diff --git a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png deleted file mode 100644 index 4cde121..0000000 Binary files a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ diff --git a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png deleted file mode 100644 index d0ef06e..0000000 Binary files a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and /dev/null differ diff --git a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png deleted file mode 100644 index dcdc230..0000000 Binary files a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and /dev/null differ diff --git a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png deleted file mode 100644 index 2ccbfd9..0000000 Binary files a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ diff --git a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png deleted file mode 100644 index c8f9ed8..0000000 Binary files a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and /dev/null differ diff --git a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png deleted file mode 100644 index a6d6b86..0000000 Binary files a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and /dev/null differ diff --git a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png deleted file mode 100644 index a6d6b86..0000000 Binary files a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and /dev/null differ diff --git a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png deleted file mode 100644 index 75b2d16..0000000 Binary files a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and /dev/null differ diff --git a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png deleted file mode 100644 index c4df70d..0000000 Binary files a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ diff --git a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png deleted file mode 100644 index 6a84f41..0000000 Binary files a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and /dev/null differ diff --git a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png deleted file mode 100644 index d0e1f58..0000000 Binary files a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and /dev/null differ diff --git a/test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png deleted file mode 100644 index 3c4935a..0000000 Binary files a/test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and /dev/null differ diff --git a/test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png deleted file mode 100644 index ed4cc16..0000000 Binary files a/test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and /dev/null differ diff --git a/test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png deleted file mode 100644 index 483be61..0000000 Binary files a/test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and /dev/null differ diff --git a/test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png deleted file mode 100644 index bcbf36d..0000000 Binary files a/test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and /dev/null differ diff --git a/test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png deleted file mode 100644 index 9c0a652..0000000 Binary files a/test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and /dev/null differ diff --git a/test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png deleted file mode 100644 index e71a726..0000000 Binary files a/test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and /dev/null differ diff --git a/test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png deleted file mode 100644 index 8a31fe2..0000000 Binary files a/test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and /dev/null differ diff --git a/test_shard/integration_test_app/.gitignore b/tests/integration_test_app/.gitignore similarity index 80% rename from test_shard/integration_test_app/.gitignore rename to tests/integration_test_app/.gitignore index 9c6177d..29a3a50 100644 --- a/test_shard/integration_test_app/.gitignore +++ b/tests/integration_test_app/.gitignore @@ -27,26 +27,17 @@ migrate_working_dir/ .dart_tool/ .flutter-plugins .flutter-plugins-dependencies -.packages .pub-cache/ .pub/ /build/ -# Web related -lib/generated_plugin_registrant.dart - # Symbolication related app.*.symbols # Obfuscation related app.*.map.json -pubspec.lock - # Android Studio will place build artifacts here /android/app/debug /android/app/profile /android/app/release - -macos/Flutter/GeneratedPluginRegistrant.swift -windows/flutter/generated_plugin_registrant.cc diff --git a/tests/integration_test_app/.metadata b/tests/integration_test_app/.metadata new file mode 100644 index 0000000..90eabcf --- /dev/null +++ b/tests/integration_test_app/.metadata @@ -0,0 +1,45 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: "80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819" + channel: "stable" + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819 + base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819 + - platform: android + create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819 + base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819 + - platform: ios + create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819 + base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819 + - platform: linux + create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819 + base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819 + - platform: macos + create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819 + base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819 + - platform: web + create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819 + base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819 + - platform: windows + create_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819 + base_revision: 80c2e84975bbd28ecf5f8d4bd4ca5a2490bfc819 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/tests/integration_test_app/README.md b/tests/integration_test_app/README.md new file mode 100644 index 0000000..963df90 --- /dev/null +++ b/tests/integration_test_app/README.md @@ -0,0 +1,16 @@ +# integration_test_app + +A new Flutter project. + +## Getting Started + +This project is a starting point for a Flutter application. + +A few resources to get you started if this is your first Flutter project: + +- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) +- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) + +For help getting started with Flutter development, view the +[online documentation](https://docs.flutter.dev/), which offers tutorials, +samples, guidance on mobile development, and a full API reference. diff --git a/test_shard/iris_tester/example/analysis_options.yaml b/tests/integration_test_app/analysis_options.yaml similarity index 93% rename from test_shard/iris_tester/example/analysis_options.yaml rename to tests/integration_test_app/analysis_options.yaml index 61b6c4d..0d29021 100644 --- a/test_shard/iris_tester/example/analysis_options.yaml +++ b/tests/integration_test_app/analysis_options.yaml @@ -13,8 +13,7 @@ linter: # The lint rules applied to this project can be customized in the # section below to disable rules from the `package:flutter_lints/flutter.yaml` # included above or to enable additional rules. A list of all available lints - # and their documentation is published at - # https://dart-lang.github.io/linter/lints/index.html. + # and their documentation is published at https://dart.dev/lints. # # Instead of disabling a lint rule for the entire project in the # section below, it can also be suppressed for a single line of code diff --git a/test_shard/iris_tester/example/android/.gitignore b/tests/integration_test_app/android/.gitignore similarity index 69% rename from test_shard/iris_tester/example/android/.gitignore rename to tests/integration_test_app/android/.gitignore index 6f56801..55afd91 100644 --- a/test_shard/iris_tester/example/android/.gitignore +++ b/tests/integration_test_app/android/.gitignore @@ -7,7 +7,7 @@ gradle-wrapper.jar GeneratedPluginRegistrant.java # Remember to never publicly share your keystore. -# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +# See https://flutter.dev/to/reference-keystore key.properties **/*.keystore **/*.jks diff --git a/tests/integration_test_app/android/app/build.gradle b/tests/integration_test_app/android/app/build.gradle new file mode 100644 index 0000000..7b47104 --- /dev/null +++ b/tests/integration_test_app/android/app/build.gradle @@ -0,0 +1,44 @@ +plugins { + id "com.android.application" + id "kotlin-android" + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id "dev.flutter.flutter-gradle-plugin" +} + +android { + namespace = "com.example.integration_test_app" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = JavaVersion.VERSION_1_8 + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId = "com.example.integration_test_app" + // You can update the following values to match your application needs. + // For more information, see: https://flutter.dev/to/review-gradle-config. + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + versionCode = flutter.versionCode + versionName = flutter.versionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig = signingConfigs.debug + } + } +} + +flutter { + source = "../.." +} diff --git a/test_shard/integration_test_app/android/app/src/debug/AndroidManifest.xml b/tests/integration_test_app/android/app/src/debug/AndroidManifest.xml similarity index 83% rename from test_shard/integration_test_app/android/app/src/debug/AndroidManifest.xml rename to tests/integration_test_app/android/app/src/debug/AndroidManifest.xml index 1f6892e..399f698 100644 --- a/test_shard/integration_test_app/android/app/src/debug/AndroidManifest.xml +++ b/tests/integration_test_app/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - + + + + + + + diff --git a/tests/integration_test_app/android/app/src/main/java/com/example/integration_test_app/MainActivity.java b/tests/integration_test_app/android/app/src/main/java/com/example/integration_test_app/MainActivity.java new file mode 100644 index 0000000..d4f20d2 --- /dev/null +++ b/tests/integration_test_app/android/app/src/main/java/com/example/integration_test_app/MainActivity.java @@ -0,0 +1,6 @@ +package com.example.integration_test_app; + +import io.flutter.embedding.android.FlutterActivity; + +public class MainActivity extends FlutterActivity { +} diff --git a/test_shard/integration_test_app/android/app/src/main/res/drawable-v21/launch_background.xml b/tests/integration_test_app/android/app/src/main/res/drawable-v21/launch_background.xml similarity index 100% rename from test_shard/integration_test_app/android/app/src/main/res/drawable-v21/launch_background.xml rename to tests/integration_test_app/android/app/src/main/res/drawable-v21/launch_background.xml diff --git a/test_shard/integration_test_app/android/app/src/main/res/drawable/launch_background.xml b/tests/integration_test_app/android/app/src/main/res/drawable/launch_background.xml similarity index 100% rename from test_shard/integration_test_app/android/app/src/main/res/drawable/launch_background.xml rename to tests/integration_test_app/android/app/src/main/res/drawable/launch_background.xml diff --git a/test_shard/integration_test_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/tests/integration_test_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from test_shard/integration_test_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to tests/integration_test_app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/test_shard/integration_test_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/tests/integration_test_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from test_shard/integration_test_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to tests/integration_test_app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/test_shard/integration_test_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/tests/integration_test_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from test_shard/integration_test_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to tests/integration_test_app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/test_shard/integration_test_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/tests/integration_test_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from test_shard/integration_test_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to tests/integration_test_app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/test_shard/integration_test_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/tests/integration_test_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from test_shard/integration_test_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to tests/integration_test_app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/test_shard/integration_test_app/android/app/src/main/res/values-night/styles.xml b/tests/integration_test_app/android/app/src/main/res/values-night/styles.xml similarity index 100% rename from test_shard/integration_test_app/android/app/src/main/res/values-night/styles.xml rename to tests/integration_test_app/android/app/src/main/res/values-night/styles.xml diff --git a/test_shard/integration_test_app/android/app/src/main/res/values/styles.xml b/tests/integration_test_app/android/app/src/main/res/values/styles.xml similarity index 100% rename from test_shard/integration_test_app/android/app/src/main/res/values/styles.xml rename to tests/integration_test_app/android/app/src/main/res/values/styles.xml diff --git a/test_shard/integration_test_app/android/app/src/profile/AndroidManifest.xml b/tests/integration_test_app/android/app/src/profile/AndroidManifest.xml similarity index 83% rename from test_shard/integration_test_app/android/app/src/profile/AndroidManifest.xml rename to tests/integration_test_app/android/app/src/profile/AndroidManifest.xml index 1f6892e..399f698 100644 --- a/test_shard/integration_test_app/android/app/src/profile/AndroidManifest.xml +++ b/tests/integration_test_app/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,4 @@ - + - - + diff --git a/test_shard/integration_test_app/web/manifest.json b/tests/integration_test_app/web/manifest.json similarity index 100% rename from test_shard/integration_test_app/web/manifest.json rename to tests/integration_test_app/web/manifest.json diff --git a/test_shard/integration_test_app/windows/.gitignore b/tests/integration_test_app/windows/.gitignore similarity index 100% rename from test_shard/integration_test_app/windows/.gitignore rename to tests/integration_test_app/windows/.gitignore diff --git a/test_shard/integration_test_app/windows/CMakeLists.txt b/tests/integration_test_app/windows/CMakeLists.txt similarity index 93% rename from test_shard/integration_test_app/windows/CMakeLists.txt rename to tests/integration_test_app/windows/CMakeLists.txt index 5454da2..e82f6ba 100644 --- a/test_shard/integration_test_app/windows/CMakeLists.txt +++ b/tests/integration_test_app/windows/CMakeLists.txt @@ -8,7 +8,7 @@ set(BINARY_NAME "integration_test_app") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. -cmake_policy(SET CMP0063 NEW) +cmake_policy(VERSION 3.14...3.25) # Define build configuration option. get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) @@ -52,6 +52,7 @@ add_subdirectory(${FLUTTER_MANAGED_DIR}) # Application build; see runner/CMakeLists.txt. add_subdirectory("runner") + # Generated plugin build rules, which manage building the plugins and adding # them to the application. include(flutter/generated_plugins.cmake) @@ -86,6 +87,12 @@ if(PLUGIN_BUNDLED_LIBRARIES) COMPONENT Runtime) endif() +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + # Fully re-copy the assets directory on each build to avoid having stale files # from a previous install. set(FLUTTER_ASSET_DIR_NAME "flutter_assets") diff --git a/test_shard/iris_tester/example/windows/flutter/CMakeLists.txt b/tests/integration_test_app/windows/flutter/CMakeLists.txt similarity index 94% rename from test_shard/iris_tester/example/windows/flutter/CMakeLists.txt rename to tests/integration_test_app/windows/flutter/CMakeLists.txt index 930d207..903f489 100644 --- a/test_shard/iris_tester/example/windows/flutter/CMakeLists.txt +++ b/tests/integration_test_app/windows/flutter/CMakeLists.txt @@ -10,6 +10,11 @@ include(${EPHEMERAL_DIR}/generated_config.cmake) # https://github.com/flutter/flutter/issues/57146. set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + # === Flutter Library === set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") @@ -92,7 +97,7 @@ add_custom_command( COMMAND ${CMAKE_COMMAND} -E env ${FLUTTER_TOOL_ENVIRONMENT} "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" - windows-x64 $ + ${FLUTTER_TARGET_PLATFORM} $ VERBATIM ) add_custom_target(flutter_assemble DEPENDS diff --git a/test_shard/iris_tester/example/windows/flutter/generated_plugin_registrant.cc b/tests/integration_test_app/windows/flutter/generated_plugin_registrant.cc similarity index 100% rename from test_shard/iris_tester/example/windows/flutter/generated_plugin_registrant.cc rename to tests/integration_test_app/windows/flutter/generated_plugin_registrant.cc diff --git a/test_shard/integration_test_app/windows/flutter/generated_plugin_registrant.h b/tests/integration_test_app/windows/flutter/generated_plugin_registrant.h similarity index 100% rename from test_shard/integration_test_app/windows/flutter/generated_plugin_registrant.h rename to tests/integration_test_app/windows/flutter/generated_plugin_registrant.h diff --git a/test_shard/integration_test_app/windows/flutter/generated_plugins.cmake b/tests/integration_test_app/windows/flutter/generated_plugins.cmake similarity index 100% rename from test_shard/integration_test_app/windows/flutter/generated_plugins.cmake rename to tests/integration_test_app/windows/flutter/generated_plugins.cmake diff --git a/test_shard/iris_tester/example/windows/runner/CMakeLists.txt b/tests/integration_test_app/windows/runner/CMakeLists.txt similarity index 66% rename from test_shard/iris_tester/example/windows/runner/CMakeLists.txt rename to tests/integration_test_app/windows/runner/CMakeLists.txt index b9e550f..394917c 100644 --- a/test_shard/iris_tester/example/windows/runner/CMakeLists.txt +++ b/tests/integration_test_app/windows/runner/CMakeLists.txt @@ -20,12 +20,20 @@ add_executable(${BINARY_NAME} WIN32 # that need different build settings. apply_standard_settings(${BINARY_NAME}) +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + # Disable Windows macros that collide with C++ standard library functions. target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") # Add dependency libraries and include directories. Add any application-specific # dependencies here. target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") # Run the Flutter tool portions of the build. This must not be removed. diff --git a/test_shard/integration_test_app/windows/runner/Runner.rc b/tests/integration_test_app/windows/runner/Runner.rc similarity index 83% rename from test_shard/integration_test_app/windows/runner/Runner.rc rename to tests/integration_test_app/windows/runner/Runner.rc index 934c7b5..38af86e 100644 --- a/test_shard/integration_test_app/windows/runner/Runner.rc +++ b/tests/integration_test_app/windows/runner/Runner.rc @@ -60,14 +60,14 @@ IDI_APP_ICON ICON "resources\\app_icon.ico" // Version // -#ifdef FLUTTER_BUILD_NUMBER -#define VERSION_AS_NUMBER FLUTTER_BUILD_NUMBER +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD #else -#define VERSION_AS_NUMBER 1,0,0 +#define VERSION_AS_NUMBER 1,0,0,0 #endif -#ifdef FLUTTER_BUILD_NAME -#define VERSION_AS_STRING #FLUTTER_BUILD_NAME +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION #else #define VERSION_AS_STRING "1.0.0" #endif @@ -89,11 +89,11 @@ BEGIN BEGIN BLOCK "040904e4" BEGIN - VALUE "CompanyName", "io.agora.integration_test_app" "\0" + VALUE "CompanyName", "com.example" "\0" VALUE "FileDescription", "integration_test_app" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" VALUE "InternalName", "integration_test_app" "\0" - VALUE "LegalCopyright", "Copyright (C) 2022 io.agora.integration_test_app. All rights reserved." "\0" + VALUE "LegalCopyright", "Copyright (C) 2024 com.example. All rights reserved." "\0" VALUE "OriginalFilename", "integration_test_app.exe" "\0" VALUE "ProductName", "integration_test_app" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0" diff --git a/test_shard/iris_tester/example/windows/runner/flutter_window.cpp b/tests/integration_test_app/windows/runner/flutter_window.cpp similarity index 83% rename from test_shard/iris_tester/example/windows/runner/flutter_window.cpp rename to tests/integration_test_app/windows/runner/flutter_window.cpp index b43b909..955ee30 100644 --- a/test_shard/iris_tester/example/windows/runner/flutter_window.cpp +++ b/tests/integration_test_app/windows/runner/flutter_window.cpp @@ -26,6 +26,16 @@ bool FlutterWindow::OnCreate() { } RegisterPlugins(flutter_controller_->engine()); SetChildContent(flutter_controller_->view()->GetNativeWindow()); + + flutter_controller_->engine()->SetNextFrameCallback([&]() { + this->Show(); + }); + + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + return true; } diff --git a/test_shard/integration_test_app/windows/runner/flutter_window.h b/tests/integration_test_app/windows/runner/flutter_window.h similarity index 100% rename from test_shard/integration_test_app/windows/runner/flutter_window.h rename to tests/integration_test_app/windows/runner/flutter_window.h diff --git a/test_shard/integration_test_app/windows/runner/main.cpp b/tests/integration_test_app/windows/runner/main.cpp similarity index 94% rename from test_shard/integration_test_app/windows/runner/main.cpp rename to tests/integration_test_app/windows/runner/main.cpp index 7c1992f..358f93e 100644 --- a/test_shard/integration_test_app/windows/runner/main.cpp +++ b/tests/integration_test_app/windows/runner/main.cpp @@ -27,7 +27,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, FlutterWindow window(project); Win32Window::Point origin(10, 10); Win32Window::Size size(1280, 720); - if (!window.CreateAndShow(L"integration_test_app", origin, size)) { + if (!window.Create(L"integration_test_app", origin, size)) { return EXIT_FAILURE; } window.SetQuitOnClose(true); diff --git a/test_shard/integration_test_app/windows/runner/resource.h b/tests/integration_test_app/windows/runner/resource.h similarity index 100% rename from test_shard/integration_test_app/windows/runner/resource.h rename to tests/integration_test_app/windows/runner/resource.h diff --git a/test_shard/integration_test_app/windows/runner/resources/app_icon.ico b/tests/integration_test_app/windows/runner/resources/app_icon.ico similarity index 100% rename from test_shard/integration_test_app/windows/runner/resources/app_icon.ico rename to tests/integration_test_app/windows/runner/resources/app_icon.ico diff --git a/test_shard/iris_tester/example/windows/runner/runner.exe.manifest b/tests/integration_test_app/windows/runner/runner.exe.manifest similarity index 65% rename from test_shard/iris_tester/example/windows/runner/runner.exe.manifest rename to tests/integration_test_app/windows/runner/runner.exe.manifest index c977c4a..153653e 100644 --- a/test_shard/iris_tester/example/windows/runner/runner.exe.manifest +++ b/tests/integration_test_app/windows/runner/runner.exe.manifest @@ -7,14 +7,8 @@ - + - - - - - - diff --git a/test_shard/iris_tester/example/windows/runner/utils.cpp b/tests/integration_test_app/windows/runner/utils.cpp similarity index 85% rename from test_shard/iris_tester/example/windows/runner/utils.cpp rename to tests/integration_test_app/windows/runner/utils.cpp index f5bf9fa..3a0b465 100644 --- a/test_shard/iris_tester/example/windows/runner/utils.cpp +++ b/tests/integration_test_app/windows/runner/utils.cpp @@ -45,9 +45,11 @@ std::string Utf8FromUtf16(const wchar_t* utf16_string) { if (utf16_string == nullptr) { return std::string(); } - int target_length = ::WideCharToMultiByte( + unsigned int target_length = ::WideCharToMultiByte( CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, - -1, nullptr, 0, nullptr, nullptr); + -1, nullptr, 0, nullptr, nullptr) + -1; // remove the trailing null character + int input_length = (int)wcslen(utf16_string); std::string utf8_string; if (target_length == 0 || target_length > utf8_string.max_size()) { return utf8_string; @@ -55,8 +57,7 @@ std::string Utf8FromUtf16(const wchar_t* utf16_string) { utf8_string.resize(target_length); int converted_length = ::WideCharToMultiByte( CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, - -1, utf8_string.data(), - target_length, nullptr, nullptr); + input_length, utf8_string.data(), target_length, nullptr, nullptr); if (converted_length == 0) { return std::string(); } diff --git a/test_shard/integration_test_app/windows/runner/utils.h b/tests/integration_test_app/windows/runner/utils.h similarity index 100% rename from test_shard/integration_test_app/windows/runner/utils.h rename to tests/integration_test_app/windows/runner/utils.h diff --git a/test_shard/iris_tester/example/windows/runner/win32_window.cpp b/tests/integration_test_app/windows/runner/win32_window.cpp similarity index 78% rename from test_shard/iris_tester/example/windows/runner/win32_window.cpp rename to tests/integration_test_app/windows/runner/win32_window.cpp index c10f08d..60608d0 100644 --- a/test_shard/iris_tester/example/windows/runner/win32_window.cpp +++ b/tests/integration_test_app/windows/runner/win32_window.cpp @@ -1,13 +1,31 @@ #include "win32_window.h" +#include #include #include "resource.h" namespace { +/// Window attribute that enables dark mode window decorations. +/// +/// Redefined in case the developer's machine has a Windows SDK older than +/// version 10.0.22000.0. +/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute +#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE +#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 +#endif + constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; +/// Registry key for app theme preference. +/// +/// A value of 0 indicates apps should use dark mode. A non-zero or missing +/// value indicates apps should use light mode. +constexpr const wchar_t kGetPreferredBrightnessRegKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; +constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; + // The number of Win32Window objects that currently exist. static int g_active_window_count = 0; @@ -31,8 +49,8 @@ void EnableFullDpiSupportIfAvailable(HWND hwnd) { GetProcAddress(user32_module, "EnableNonClientDpiScaling")); if (enable_non_client_dpi_scaling != nullptr) { enable_non_client_dpi_scaling(hwnd); - FreeLibrary(user32_module); } + FreeLibrary(user32_module); } } // namespace @@ -42,7 +60,7 @@ class WindowClassRegistrar { public: ~WindowClassRegistrar() = default; - // Returns the singleton registar instance. + // Returns the singleton registrar instance. static WindowClassRegistrar* GetInstance() { if (!instance_) { instance_ = new WindowClassRegistrar(); @@ -102,9 +120,9 @@ Win32Window::~Win32Window() { Destroy(); } -bool Win32Window::CreateAndShow(const std::wstring& title, - const Point& origin, - const Size& size) { +bool Win32Window::Create(const std::wstring& title, + const Point& origin, + const Size& size) { Destroy(); const wchar_t* window_class = @@ -117,7 +135,7 @@ bool Win32Window::CreateAndShow(const std::wstring& title, double scale_factor = dpi / 96.0; HWND window = CreateWindow( - window_class, title.c_str(), WS_OVERLAPPEDWINDOW | WS_VISIBLE, + window_class, title.c_str(), WS_OVERLAPPEDWINDOW, Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), Scale(size.width, scale_factor), Scale(size.height, scale_factor), nullptr, nullptr, GetModuleHandle(nullptr), this); @@ -126,9 +144,15 @@ bool Win32Window::CreateAndShow(const std::wstring& title, return false; } + UpdateTheme(window); + return OnCreate(); } +bool Win32Window::Show() { + return ShowWindow(window_handle_, SW_SHOWNORMAL); +} + // static LRESULT CALLBACK Win32Window::WndProc(HWND const window, UINT const message, @@ -188,6 +212,10 @@ Win32Window::MessageHandler(HWND hwnd, SetFocus(child_content_); } return 0; + + case WM_DWMCOLORIZATIONCOLORCHANGED: + UpdateTheme(hwnd); + return 0; } return DefWindowProc(window_handle_, message, wparam, lparam); @@ -243,3 +271,18 @@ bool Win32Window::OnCreate() { void Win32Window::OnDestroy() { // No-op; provided for subclasses. } + +void Win32Window::UpdateTheme(HWND const window) { + DWORD light_mode; + DWORD light_mode_size = sizeof(light_mode); + LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, + kGetPreferredBrightnessRegValue, + RRF_RT_REG_DWORD, nullptr, &light_mode, + &light_mode_size); + + if (result == ERROR_SUCCESS) { + BOOL enable_dark_mode = light_mode == 0; + DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, + &enable_dark_mode, sizeof(enable_dark_mode)); + } +} diff --git a/test_shard/iris_tester/example/windows/runner/win32_window.h b/tests/integration_test_app/windows/runner/win32_window.h similarity index 81% rename from test_shard/iris_tester/example/windows/runner/win32_window.h rename to tests/integration_test_app/windows/runner/win32_window.h index 17ba431..e901dde 100644 --- a/test_shard/iris_tester/example/windows/runner/win32_window.h +++ b/tests/integration_test_app/windows/runner/win32_window.h @@ -28,15 +28,16 @@ class Win32Window { Win32Window(); virtual ~Win32Window(); - // Creates and shows a win32 window with |title| and position and size using + // Creates a win32 window with |title| that is positioned and sized using // |origin| and |size|. New windows are created on the default monitor. Window // sizes are specified to the OS in physical pixels, hence to ensure a - // consistent size to will treat the width height passed in to this function - // as logical pixels and scale to appropriate for the default monitor. Returns - // true if the window was created successfully. - bool CreateAndShow(const std::wstring& title, - const Point& origin, - const Size& size); + // consistent size this function will scale the inputted width and height as + // as appropriate for the default monitor. The window is invisible until + // |Show| is called. Returns true if the window was created successfully. + bool Create(const std::wstring& title, const Point& origin, const Size& size); + + // Show the current window. Returns true if the window was successfully shown. + bool Show(); // Release OS resources associated with window. void Destroy(); @@ -76,7 +77,7 @@ class Win32Window { // OS callback called by message pump. Handles the WM_NCCREATE message which // is passed when the non-client area is being created and enables automatic // non-client DPI scaling so that the non-client area automatically - // responsponds to changes in DPI. All other messages are handled by + // responds to changes in DPI. All other messages are handled by // MessageHandler. static LRESULT CALLBACK WndProc(HWND const window, UINT const message, @@ -86,6 +87,9 @@ class Win32Window { // Retrieves a class instance pointer for |window| static Win32Window* GetThisFromHandle(HWND const window) noexcept; + // Update the window frame's theme to match the system theme. + static void UpdateTheme(HWND const window); + bool quit_on_close_ = false; // window handle for top level window. diff --git a/test_shard/iris_tester/.gitignore b/tests/iris_tester/.gitignore similarity index 100% rename from test_shard/iris_tester/.gitignore rename to tests/iris_tester/.gitignore diff --git a/test_shard/iris_tester/.metadata b/tests/iris_tester/.metadata similarity index 100% rename from test_shard/iris_tester/.metadata rename to tests/iris_tester/.metadata diff --git a/test_shard/iris_tester/CHANGELOG.md b/tests/iris_tester/CHANGELOG.md similarity index 100% rename from test_shard/iris_tester/CHANGELOG.md rename to tests/iris_tester/CHANGELOG.md diff --git a/test_shard/iris_tester/LICENSE b/tests/iris_tester/LICENSE similarity index 100% rename from test_shard/iris_tester/LICENSE rename to tests/iris_tester/LICENSE diff --git a/test_shard/iris_tester/README.md b/tests/iris_tester/README.md similarity index 100% rename from test_shard/iris_tester/README.md rename to tests/iris_tester/README.md diff --git a/test_shard/iris_tester/analysis_options.yaml b/tests/iris_tester/analysis_options.yaml similarity index 100% rename from test_shard/iris_tester/analysis_options.yaml rename to tests/iris_tester/analysis_options.yaml diff --git a/test_shard/iris_tester/android/.gitignore b/tests/iris_tester/android/.gitignore similarity index 100% rename from test_shard/iris_tester/android/.gitignore rename to tests/iris_tester/android/.gitignore diff --git a/test_shard/iris_tester/android/build.gradle b/tests/iris_tester/android/build.gradle similarity index 96% rename from test_shard/iris_tester/android/build.gradle rename to tests/iris_tester/android/build.gradle index f832dc3..b98b1bd 100644 --- a/test_shard/iris_tester/android/build.gradle +++ b/tests/iris_tester/android/build.gradle @@ -2,7 +2,7 @@ group 'com.example.iris_tester' version '1.0-SNAPSHOT' buildscript { - ext.kotlin_version = '1.7.0' + ext.kotlin_version = '1.7.10' repositories { google() mavenCentral() diff --git a/test_shard/iris_tester/android/settings.gradle b/tests/iris_tester/android/settings.gradle similarity index 100% rename from test_shard/iris_tester/android/settings.gradle rename to tests/iris_tester/android/settings.gradle diff --git a/test_shard/iris_tester/android/src/main/AndroidManifest.xml b/tests/iris_tester/android/src/main/AndroidManifest.xml similarity index 100% rename from test_shard/iris_tester/android/src/main/AndroidManifest.xml rename to tests/iris_tester/android/src/main/AndroidManifest.xml diff --git a/test_shard/iris_tester/android/src/main/kotlin/com/example/iris_tester/IrisTesterPlugin.kt b/tests/iris_tester/android/src/main/kotlin/com/example/iris_tester/IrisTesterPlugin.kt similarity index 100% rename from test_shard/iris_tester/android/src/main/kotlin/com/example/iris_tester/IrisTesterPlugin.kt rename to tests/iris_tester/android/src/main/kotlin/com/example/iris_tester/IrisTesterPlugin.kt diff --git a/test_shard/iris_tester/cxx/CMakeLists.txt b/tests/iris_tester/cxx/CMakeLists.txt similarity index 100% rename from test_shard/iris_tester/cxx/CMakeLists.txt rename to tests/iris_tester/cxx/CMakeLists.txt diff --git a/test_shard/iris_tester/cxx/build-macos.sh b/tests/iris_tester/cxx/build-macos.sh similarity index 100% rename from test_shard/iris_tester/cxx/build-macos.sh rename to tests/iris_tester/cxx/build-macos.sh diff --git a/test_shard/iris_tester/cxx/ios.toolchain.cmake b/tests/iris_tester/cxx/ios.toolchain.cmake similarity index 100% rename from test_shard/iris_tester/cxx/ios.toolchain.cmake rename to tests/iris_tester/cxx/ios.toolchain.cmake diff --git a/test_shard/iris_tester/cxx/render_configs_dart.yaml b/tests/iris_tester/cxx/render_configs_dart.yaml similarity index 100% rename from test_shard/iris_tester/cxx/render_configs_dart.yaml rename to tests/iris_tester/cxx/render_configs_dart.yaml diff --git a/test_shard/iris_tester/cxx/src/event_triggers/rtcengine_eventhandler_trigger.hpp b/tests/iris_tester/cxx/src/event_triggers/rtcengine_eventhandler_trigger.hpp similarity index 100% rename from test_shard/iris_tester/cxx/src/event_triggers/rtcengine_eventhandler_trigger.hpp rename to tests/iris_tester/cxx/src/event_triggers/rtcengine_eventhandler_trigger.hpp diff --git a/test_shard/iris_tester/cxx/src/fake/fake_iaudiodevicemanager.hpp b/tests/iris_tester/cxx/src/fake/fake_iaudiodevicemanager.hpp similarity index 100% rename from test_shard/iris_tester/cxx/src/fake/fake_iaudiodevicemanager.hpp rename to tests/iris_tester/cxx/src/fake/fake_iaudiodevicemanager.hpp diff --git a/test_shard/iris_tester/cxx/src/fake/fake_ilocalspatialaudioengine.hpp b/tests/iris_tester/cxx/src/fake/fake_ilocalspatialaudioengine.hpp similarity index 100% rename from test_shard/iris_tester/cxx/src/fake/fake_ilocalspatialaudioengine.hpp rename to tests/iris_tester/cxx/src/fake/fake_ilocalspatialaudioengine.hpp diff --git a/test_shard/iris_tester/cxx/src/fake/fake_imediaplayer.hpp b/tests/iris_tester/cxx/src/fake/fake_imediaplayer.hpp similarity index 100% rename from test_shard/iris_tester/cxx/src/fake/fake_imediaplayer.hpp rename to tests/iris_tester/cxx/src/fake/fake_imediaplayer.hpp diff --git a/test_shard/iris_tester/cxx/src/fake/fake_imusiccontentcenter.hpp b/tests/iris_tester/cxx/src/fake/fake_imusiccontentcenter.hpp similarity index 100% rename from test_shard/iris_tester/cxx/src/fake/fake_imusiccontentcenter.hpp rename to tests/iris_tester/cxx/src/fake/fake_imusiccontentcenter.hpp diff --git a/test_shard/iris_tester/cxx/src/fake/fake_irtcengineex.hpp b/tests/iris_tester/cxx/src/fake/fake_irtcengineex.hpp similarity index 100% rename from test_shard/iris_tester/cxx/src/fake/fake_irtcengineex.hpp rename to tests/iris_tester/cxx/src/fake/fake_irtcengineex.hpp diff --git a/test_shard/iris_tester/cxx/src/fake/fake_string.hpp b/tests/iris_tester/cxx/src/fake/fake_string.hpp similarity index 100% rename from test_shard/iris_tester/cxx/src/fake/fake_string.hpp rename to tests/iris_tester/cxx/src/fake/fake_string.hpp diff --git a/test_shard/iris_tester/cxx/src/fake_gen/fake_iagoraparameter_internal.hpp b/tests/iris_tester/cxx/src/fake_gen/fake_iagoraparameter_internal.hpp similarity index 100% rename from test_shard/iris_tester/cxx/src/fake_gen/fake_iagoraparameter_internal.hpp rename to tests/iris_tester/cxx/src/fake_gen/fake_iagoraparameter_internal.hpp diff --git a/test_shard/iris_tester/cxx/src/fake_gen/fake_iaudiodevicecollection_internal.hpp b/tests/iris_tester/cxx/src/fake_gen/fake_iaudiodevicecollection_internal.hpp similarity index 100% rename from test_shard/iris_tester/cxx/src/fake_gen/fake_iaudiodevicecollection_internal.hpp rename to tests/iris_tester/cxx/src/fake_gen/fake_iaudiodevicecollection_internal.hpp diff --git a/test_shard/iris_tester/cxx/src/fake_gen/fake_iaudiodevicemanager_internal.hpp b/tests/iris_tester/cxx/src/fake_gen/fake_iaudiodevicemanager_internal.hpp similarity index 100% rename from test_shard/iris_tester/cxx/src/fake_gen/fake_iaudiodevicemanager_internal.hpp rename to tests/iris_tester/cxx/src/fake_gen/fake_iaudiodevicemanager_internal.hpp diff --git a/test_shard/iris_tester/cxx/src/fake_gen/fake_ilocalspatialaudioengine_internal.hpp b/tests/iris_tester/cxx/src/fake_gen/fake_ilocalspatialaudioengine_internal.hpp similarity index 100% rename from test_shard/iris_tester/cxx/src/fake_gen/fake_ilocalspatialaudioengine_internal.hpp rename to tests/iris_tester/cxx/src/fake_gen/fake_ilocalspatialaudioengine_internal.hpp diff --git a/test_shard/iris_tester/cxx/src/fake_gen/fake_imediaengine_internal.hpp b/tests/iris_tester/cxx/src/fake_gen/fake_imediaengine_internal.hpp similarity index 100% rename from test_shard/iris_tester/cxx/src/fake_gen/fake_imediaengine_internal.hpp rename to tests/iris_tester/cxx/src/fake_gen/fake_imediaengine_internal.hpp diff --git a/test_shard/iris_tester/cxx/src/fake_gen/fake_imediaplayer_internal.hpp b/tests/iris_tester/cxx/src/fake_gen/fake_imediaplayer_internal.hpp similarity index 100% rename from test_shard/iris_tester/cxx/src/fake_gen/fake_imediaplayer_internal.hpp rename to tests/iris_tester/cxx/src/fake_gen/fake_imediaplayer_internal.hpp diff --git a/test_shard/iris_tester/cxx/src/fake_gen/fake_imediarecorder_internal.hpp b/tests/iris_tester/cxx/src/fake_gen/fake_imediarecorder_internal.hpp similarity index 100% rename from test_shard/iris_tester/cxx/src/fake_gen/fake_imediarecorder_internal.hpp rename to tests/iris_tester/cxx/src/fake_gen/fake_imediarecorder_internal.hpp diff --git a/test_shard/iris_tester/cxx/src/fake_gen/fake_imusiccontentcenter_internal.hpp b/tests/iris_tester/cxx/src/fake_gen/fake_imusiccontentcenter_internal.hpp similarity index 100% rename from test_shard/iris_tester/cxx/src/fake_gen/fake_imusiccontentcenter_internal.hpp rename to tests/iris_tester/cxx/src/fake_gen/fake_imusiccontentcenter_internal.hpp diff --git a/test_shard/iris_tester/cxx/src/fake_gen/fake_imusicplayer_internal.hpp b/tests/iris_tester/cxx/src/fake_gen/fake_imusicplayer_internal.hpp similarity index 100% rename from test_shard/iris_tester/cxx/src/fake_gen/fake_imusicplayer_internal.hpp rename to tests/iris_tester/cxx/src/fake_gen/fake_imusicplayer_internal.hpp diff --git a/test_shard/iris_tester/cxx/src/fake_gen/fake_irtcengineex_internal.hpp b/tests/iris_tester/cxx/src/fake_gen/fake_irtcengineex_internal.hpp similarity index 100% rename from test_shard/iris_tester/cxx/src/fake_gen/fake_irtcengineex_internal.hpp rename to tests/iris_tester/cxx/src/fake_gen/fake_irtcengineex_internal.hpp diff --git a/test_shard/iris_tester/cxx/src/fake_gen/fake_ivideodevicemanager_internal.hpp b/tests/iris_tester/cxx/src/fake_gen/fake_ivideodevicemanager_internal.hpp similarity index 100% rename from test_shard/iris_tester/cxx/src/fake_gen/fake_ivideodevicemanager_internal.hpp rename to tests/iris_tester/cxx/src/fake_gen/fake_ivideodevicemanager_internal.hpp diff --git a/test_shard/iris_tester/cxx/src/iris_debug.cc b/tests/iris_tester/cxx/src/iris_debug.cc similarity index 100% rename from test_shard/iris_tester/cxx/src/iris_debug.cc rename to tests/iris_tester/cxx/src/iris_debug.cc diff --git a/test_shard/iris_tester/cxx/src/iris_debug.h b/tests/iris_tester/cxx/src/iris_debug.h similarity index 100% rename from test_shard/iris_tester/cxx/src/iris_debug.h rename to tests/iris_tester/cxx/src/iris_debug.h diff --git a/test_shard/iris_tester/example/.gitignore b/tests/iris_tester/example/.gitignore similarity index 100% rename from test_shard/iris_tester/example/.gitignore rename to tests/iris_tester/example/.gitignore diff --git a/test_shard/iris_tester/example/README.md b/tests/iris_tester/example/README.md similarity index 100% rename from test_shard/iris_tester/example/README.md rename to tests/iris_tester/example/README.md diff --git a/test_shard/integration_test_app/analysis_options.yaml b/tests/iris_tester/example/analysis_options.yaml similarity index 100% rename from test_shard/integration_test_app/analysis_options.yaml rename to tests/iris_tester/example/analysis_options.yaml diff --git a/test_shard/integration_test_app/android/.gitignore b/tests/iris_tester/example/android/.gitignore similarity index 100% rename from test_shard/integration_test_app/android/.gitignore rename to tests/iris_tester/example/android/.gitignore diff --git a/test_shard/iris_tester/example/android/app/build.gradle b/tests/iris_tester/example/android/app/build.gradle similarity index 100% rename from test_shard/iris_tester/example/android/app/build.gradle rename to tests/iris_tester/example/android/app/build.gradle diff --git a/test_shard/iris_tester/example/android/app/src/debug/AndroidManifest.xml b/tests/iris_tester/example/android/app/src/debug/AndroidManifest.xml similarity index 100% rename from test_shard/iris_tester/example/android/app/src/debug/AndroidManifest.xml rename to tests/iris_tester/example/android/app/src/debug/AndroidManifest.xml diff --git a/test_shard/iris_tester/example/android/app/src/main/AndroidManifest.xml b/tests/iris_tester/example/android/app/src/main/AndroidManifest.xml similarity index 100% rename from test_shard/iris_tester/example/android/app/src/main/AndroidManifest.xml rename to tests/iris_tester/example/android/app/src/main/AndroidManifest.xml diff --git a/test_shard/iris_tester/example/android/app/src/main/kotlin/com/example/iris_tester_example/MainActivity.kt b/tests/iris_tester/example/android/app/src/main/kotlin/com/example/iris_tester_example/MainActivity.kt similarity index 100% rename from test_shard/iris_tester/example/android/app/src/main/kotlin/com/example/iris_tester_example/MainActivity.kt rename to tests/iris_tester/example/android/app/src/main/kotlin/com/example/iris_tester_example/MainActivity.kt diff --git a/test_shard/iris_tester/example/android/app/src/main/res/drawable-v21/launch_background.xml b/tests/iris_tester/example/android/app/src/main/res/drawable-v21/launch_background.xml similarity index 100% rename from test_shard/iris_tester/example/android/app/src/main/res/drawable-v21/launch_background.xml rename to tests/iris_tester/example/android/app/src/main/res/drawable-v21/launch_background.xml diff --git a/test_shard/iris_tester/example/android/app/src/main/res/drawable/launch_background.xml b/tests/iris_tester/example/android/app/src/main/res/drawable/launch_background.xml similarity index 100% rename from test_shard/iris_tester/example/android/app/src/main/res/drawable/launch_background.xml rename to tests/iris_tester/example/android/app/src/main/res/drawable/launch_background.xml diff --git a/test_shard/iris_tester/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/tests/iris_tester/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from test_shard/iris_tester/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to tests/iris_tester/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/test_shard/iris_tester/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/tests/iris_tester/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from test_shard/iris_tester/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to tests/iris_tester/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/test_shard/iris_tester/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/tests/iris_tester/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from test_shard/iris_tester/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to tests/iris_tester/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/test_shard/iris_tester/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/tests/iris_tester/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from test_shard/iris_tester/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to tests/iris_tester/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/test_shard/iris_tester/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/tests/iris_tester/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from test_shard/iris_tester/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to tests/iris_tester/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/test_shard/iris_tester/example/android/app/src/main/res/values-night/styles.xml b/tests/iris_tester/example/android/app/src/main/res/values-night/styles.xml similarity index 100% rename from test_shard/iris_tester/example/android/app/src/main/res/values-night/styles.xml rename to tests/iris_tester/example/android/app/src/main/res/values-night/styles.xml diff --git a/test_shard/iris_tester/example/android/app/src/main/res/values/styles.xml b/tests/iris_tester/example/android/app/src/main/res/values/styles.xml similarity index 100% rename from test_shard/iris_tester/example/android/app/src/main/res/values/styles.xml rename to tests/iris_tester/example/android/app/src/main/res/values/styles.xml diff --git a/test_shard/iris_tester/example/android/app/src/profile/AndroidManifest.xml b/tests/iris_tester/example/android/app/src/profile/AndroidManifest.xml similarity index 100% rename from test_shard/iris_tester/example/android/app/src/profile/AndroidManifest.xml rename to tests/iris_tester/example/android/app/src/profile/AndroidManifest.xml diff --git a/test_shard/iris_tester/example/android/build.gradle b/tests/iris_tester/example/android/build.gradle similarity index 94% rename from test_shard/iris_tester/example/android/build.gradle rename to tests/iris_tester/example/android/build.gradle index 5c61a4a..f33eab0 100644 --- a/test_shard/iris_tester/example/android/build.gradle +++ b/tests/iris_tester/example/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.7.0' + ext.kotlin_version = '1.7.10' repositories { google() mavenCentral() diff --git a/test_shard/integration_test_app/android/gradle.properties b/tests/iris_tester/example/android/gradle.properties similarity index 100% rename from test_shard/integration_test_app/android/gradle.properties rename to tests/iris_tester/example/android/gradle.properties diff --git a/test_shard/integration_test_app/android/gradle/wrapper/gradle-wrapper.properties b/tests/iris_tester/example/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from test_shard/integration_test_app/android/gradle/wrapper/gradle-wrapper.properties rename to tests/iris_tester/example/android/gradle/wrapper/gradle-wrapper.properties diff --git a/test_shard/integration_test_app/android/settings.gradle b/tests/iris_tester/example/android/settings.gradle similarity index 100% rename from test_shard/integration_test_app/android/settings.gradle rename to tests/iris_tester/example/android/settings.gradle diff --git a/test_shard/integration_test_app/ios/.gitignore b/tests/iris_tester/example/ios/.gitignore similarity index 97% rename from test_shard/integration_test_app/ios/.gitignore rename to tests/iris_tester/example/ios/.gitignore index c17ee20..7a7f987 100644 --- a/test_shard/integration_test_app/ios/.gitignore +++ b/tests/iris_tester/example/ios/.gitignore @@ -32,4 +32,3 @@ Runner/GeneratedPluginRegistrant.* !default.mode2v3 !default.pbxuser !default.perspectivev3 -Podfile.lock diff --git a/test_shard/iris_tester/example/ios/Flutter/AppFrameworkInfo.plist b/tests/iris_tester/example/ios/Flutter/AppFrameworkInfo.plist similarity index 100% rename from test_shard/iris_tester/example/ios/Flutter/AppFrameworkInfo.plist rename to tests/iris_tester/example/ios/Flutter/AppFrameworkInfo.plist diff --git a/test_shard/iris_tester/example/ios/Flutter/Debug.xcconfig b/tests/iris_tester/example/ios/Flutter/Debug.xcconfig similarity index 100% rename from test_shard/iris_tester/example/ios/Flutter/Debug.xcconfig rename to tests/iris_tester/example/ios/Flutter/Debug.xcconfig diff --git a/test_shard/iris_tester/example/ios/Flutter/Release.xcconfig b/tests/iris_tester/example/ios/Flutter/Release.xcconfig similarity index 100% rename from test_shard/iris_tester/example/ios/Flutter/Release.xcconfig rename to tests/iris_tester/example/ios/Flutter/Release.xcconfig diff --git a/test_shard/iris_tester/example/ios/Podfile b/tests/iris_tester/example/ios/Podfile similarity index 100% rename from test_shard/iris_tester/example/ios/Podfile rename to tests/iris_tester/example/ios/Podfile diff --git a/test_shard/iris_tester/example/ios/Runner.xcodeproj/project.pbxproj b/tests/iris_tester/example/ios/Runner.xcodeproj/project.pbxproj similarity index 100% rename from test_shard/iris_tester/example/ios/Runner.xcodeproj/project.pbxproj rename to tests/iris_tester/example/ios/Runner.xcodeproj/project.pbxproj diff --git a/test_shard/iris_tester/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/tests/iris_tester/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from test_shard/iris_tester/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to tests/iris_tester/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/test_shard/iris_tester/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/tests/iris_tester/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from test_shard/iris_tester/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to tests/iris_tester/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/test_shard/iris_tester/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/tests/iris_tester/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from test_shard/iris_tester/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to tests/iris_tester/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/test_shard/integration_test_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/tests/iris_tester/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 100% rename from test_shard/integration_test_app/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to tests/iris_tester/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/test_shard/integration_test_app/ios/Runner.xcworkspace/contents.xcworkspacedata b/tests/iris_tester/example/ios/Runner.xcworkspace/contents.xcworkspacedata similarity index 67% rename from test_shard/integration_test_app/ios/Runner.xcworkspace/contents.xcworkspacedata rename to tests/iris_tester/example/ios/Runner.xcworkspace/contents.xcworkspacedata index 21a3cc1..1d526a1 100644 --- a/test_shard/integration_test_app/ios/Runner.xcworkspace/contents.xcworkspacedata +++ b/tests/iris_tester/example/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -4,7 +4,4 @@ - - diff --git a/test_shard/iris_tester/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/tests/iris_tester/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from test_shard/iris_tester/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to tests/iris_tester/example/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/test_shard/iris_tester/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/tests/iris_tester/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from test_shard/iris_tester/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to tests/iris_tester/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/tests/iris_tester/example/ios/Runner/AppDelegate.h b/tests/iris_tester/example/ios/Runner/AppDelegate.h new file mode 100644 index 0000000..36e21bb --- /dev/null +++ b/tests/iris_tester/example/ios/Runner/AppDelegate.h @@ -0,0 +1,6 @@ +#import +#import + +@interface AppDelegate : FlutterAppDelegate + +@end diff --git a/tests/iris_tester/example/ios/Runner/AppDelegate.m b/tests/iris_tester/example/ios/Runner/AppDelegate.m new file mode 100644 index 0000000..70e8393 --- /dev/null +++ b/tests/iris_tester/example/ios/Runner/AppDelegate.m @@ -0,0 +1,13 @@ +#import "AppDelegate.h" +#import "GeneratedPluginRegistrant.h" + +@implementation AppDelegate + +- (BOOL)application:(UIApplication *)application + didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + [GeneratedPluginRegistrant registerWithRegistry:self]; + // Override point for customization after application launch. + return [super application:application didFinishLaunchingWithOptions:launchOptions]; +} + +@end diff --git a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png similarity index 100% rename from test_shard/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png rename to tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png diff --git a/test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png similarity index 100% rename from test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png rename to tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png diff --git a/test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png similarity index 100% rename from test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png rename to tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png diff --git a/test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png similarity index 100% rename from test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png rename to tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png diff --git a/test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png similarity index 100% rename from test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png rename to tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png diff --git a/test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png similarity index 100% rename from test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png rename to tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png diff --git a/test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png similarity index 100% rename from test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png rename to tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png diff --git a/test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png similarity index 100% rename from test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png rename to tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png diff --git a/test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png similarity index 100% rename from test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png rename to tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png diff --git a/test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png similarity index 100% rename from test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png rename to tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png diff --git a/test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png similarity index 100% rename from test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png rename to tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png diff --git a/test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png similarity index 100% rename from test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png rename to tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png diff --git a/test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png similarity index 100% rename from test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png rename to tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png diff --git a/test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png similarity index 100% rename from test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png rename to tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png diff --git a/test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png similarity index 100% rename from test_shard/integration_test_app/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png rename to tests/iris_tester/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png diff --git a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/tests/iris_tester/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json similarity index 100% rename from test_shard/iris_tester/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json rename to tests/iris_tester/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json diff --git a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/tests/iris_tester/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png similarity index 100% rename from test_shard/iris_tester/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png rename to tests/iris_tester/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png diff --git a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/tests/iris_tester/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png similarity index 100% rename from test_shard/iris_tester/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png rename to tests/iris_tester/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png diff --git a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/tests/iris_tester/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png similarity index 100% rename from test_shard/iris_tester/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png rename to tests/iris_tester/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png diff --git a/test_shard/iris_tester/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/tests/iris_tester/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md similarity index 100% rename from test_shard/iris_tester/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md rename to tests/iris_tester/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md diff --git a/test_shard/iris_tester/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/tests/iris_tester/example/ios/Runner/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from test_shard/iris_tester/example/ios/Runner/Base.lproj/LaunchScreen.storyboard rename to tests/iris_tester/example/ios/Runner/Base.lproj/LaunchScreen.storyboard diff --git a/test_shard/iris_tester/example/ios/Runner/Base.lproj/Main.storyboard b/tests/iris_tester/example/ios/Runner/Base.lproj/Main.storyboard similarity index 100% rename from test_shard/iris_tester/example/ios/Runner/Base.lproj/Main.storyboard rename to tests/iris_tester/example/ios/Runner/Base.lproj/Main.storyboard diff --git a/test_shard/iris_tester/example/ios/Runner/Info.plist b/tests/iris_tester/example/ios/Runner/Info.plist similarity index 100% rename from test_shard/iris_tester/example/ios/Runner/Info.plist rename to tests/iris_tester/example/ios/Runner/Info.plist diff --git a/tests/iris_tester/example/ios/Runner/main.m b/tests/iris_tester/example/ios/Runner/main.m new file mode 100644 index 0000000..dff6597 --- /dev/null +++ b/tests/iris_tester/example/ios/Runner/main.m @@ -0,0 +1,9 @@ +#import +#import +#import "AppDelegate.h" + +int main(int argc, char* argv[]) { + @autoreleasepool { + return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); + } +} diff --git a/test_shard/iris_tester/example/lib/main.dart b/tests/iris_tester/example/lib/main.dart similarity index 100% rename from test_shard/iris_tester/example/lib/main.dart rename to tests/iris_tester/example/lib/main.dart diff --git a/test_shard/integration_test_app/macos/.gitignore b/tests/iris_tester/example/macos/.gitignore similarity index 87% rename from test_shard/integration_test_app/macos/.gitignore rename to tests/iris_tester/example/macos/.gitignore index e273000..746adbb 100644 --- a/test_shard/integration_test_app/macos/.gitignore +++ b/tests/iris_tester/example/macos/.gitignore @@ -5,4 +5,3 @@ # Xcode-related **/dgph **/xcuserdata/ -Podfile.lock diff --git a/test_shard/iris_tester/example/macos/Flutter/Flutter-Debug.xcconfig b/tests/iris_tester/example/macos/Flutter/Flutter-Debug.xcconfig similarity index 100% rename from test_shard/iris_tester/example/macos/Flutter/Flutter-Debug.xcconfig rename to tests/iris_tester/example/macos/Flutter/Flutter-Debug.xcconfig diff --git a/test_shard/iris_tester/example/macos/Flutter/Flutter-Release.xcconfig b/tests/iris_tester/example/macos/Flutter/Flutter-Release.xcconfig similarity index 100% rename from test_shard/iris_tester/example/macos/Flutter/Flutter-Release.xcconfig rename to tests/iris_tester/example/macos/Flutter/Flutter-Release.xcconfig diff --git a/tests/iris_tester/example/macos/Flutter/GeneratedPluginRegistrant.swift b/tests/iris_tester/example/macos/Flutter/GeneratedPluginRegistrant.swift new file mode 100644 index 0000000..7faffa4 --- /dev/null +++ b/tests/iris_tester/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,12 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + +import iris_tester + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + IrisTesterPlugin.register(with: registry.registrar(forPlugin: "IrisTesterPlugin")) +} diff --git a/test_shard/iris_tester/example/macos/Podfile b/tests/iris_tester/example/macos/Podfile similarity index 100% rename from test_shard/iris_tester/example/macos/Podfile rename to tests/iris_tester/example/macos/Podfile diff --git a/test_shard/iris_tester/example/macos/Runner.xcodeproj/project.pbxproj b/tests/iris_tester/example/macos/Runner.xcodeproj/project.pbxproj similarity index 100% rename from test_shard/iris_tester/example/macos/Runner.xcodeproj/project.pbxproj rename to tests/iris_tester/example/macos/Runner.xcodeproj/project.pbxproj diff --git a/test_shard/iris_tester/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/tests/iris_tester/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from test_shard/iris_tester/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to tests/iris_tester/example/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/test_shard/iris_tester/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/tests/iris_tester/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 100% rename from test_shard/iris_tester/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to tests/iris_tester/example/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/test_shard/integration_test_app/macos/Runner.xcworkspace/contents.xcworkspacedata b/tests/iris_tester/example/macos/Runner.xcworkspace/contents.xcworkspacedata similarity index 67% rename from test_shard/integration_test_app/macos/Runner.xcworkspace/contents.xcworkspacedata rename to tests/iris_tester/example/macos/Runner.xcworkspace/contents.xcworkspacedata index 21a3cc1..1d526a1 100644 --- a/test_shard/integration_test_app/macos/Runner.xcworkspace/contents.xcworkspacedata +++ b/tests/iris_tester/example/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -4,7 +4,4 @@ - - diff --git a/test_shard/iris_tester/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/tests/iris_tester/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from test_shard/iris_tester/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to tests/iris_tester/example/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/test_shard/integration_test_app/macos/Runner/AppDelegate.swift b/tests/iris_tester/example/macos/Runner/AppDelegate.swift similarity index 100% rename from test_shard/integration_test_app/macos/Runner/AppDelegate.swift rename to tests/iris_tester/example/macos/Runner/AppDelegate.swift diff --git a/test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/tests/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from test_shard/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to tests/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/test_shard/integration_test_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/tests/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png similarity index 100% rename from test_shard/integration_test_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png rename to tests/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png diff --git a/test_shard/integration_test_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/tests/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png similarity index 100% rename from test_shard/integration_test_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png rename to tests/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png diff --git a/test_shard/integration_test_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/tests/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png similarity index 100% rename from test_shard/integration_test_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png rename to tests/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png diff --git a/test_shard/integration_test_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/tests/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png similarity index 100% rename from test_shard/integration_test_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png rename to tests/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png diff --git a/test_shard/integration_test_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/tests/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png similarity index 100% rename from test_shard/integration_test_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png rename to tests/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png diff --git a/test_shard/integration_test_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/tests/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png similarity index 100% rename from test_shard/integration_test_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png rename to tests/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png diff --git a/test_shard/integration_test_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/tests/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png similarity index 100% rename from test_shard/integration_test_app/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png rename to tests/iris_tester/example/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png diff --git a/test_shard/iris_tester/example/macos/Runner/Base.lproj/MainMenu.xib b/tests/iris_tester/example/macos/Runner/Base.lproj/MainMenu.xib similarity index 100% rename from test_shard/iris_tester/example/macos/Runner/Base.lproj/MainMenu.xib rename to tests/iris_tester/example/macos/Runner/Base.lproj/MainMenu.xib diff --git a/test_shard/iris_tester/example/macos/Runner/Configs/AppInfo.xcconfig b/tests/iris_tester/example/macos/Runner/Configs/AppInfo.xcconfig similarity index 100% rename from test_shard/iris_tester/example/macos/Runner/Configs/AppInfo.xcconfig rename to tests/iris_tester/example/macos/Runner/Configs/AppInfo.xcconfig diff --git a/test_shard/iris_tester/example/macos/Runner/Configs/Debug.xcconfig b/tests/iris_tester/example/macos/Runner/Configs/Debug.xcconfig similarity index 100% rename from test_shard/iris_tester/example/macos/Runner/Configs/Debug.xcconfig rename to tests/iris_tester/example/macos/Runner/Configs/Debug.xcconfig diff --git a/test_shard/iris_tester/example/macos/Runner/Configs/Release.xcconfig b/tests/iris_tester/example/macos/Runner/Configs/Release.xcconfig similarity index 100% rename from test_shard/iris_tester/example/macos/Runner/Configs/Release.xcconfig rename to tests/iris_tester/example/macos/Runner/Configs/Release.xcconfig diff --git a/test_shard/iris_tester/example/macos/Runner/Configs/Warnings.xcconfig b/tests/iris_tester/example/macos/Runner/Configs/Warnings.xcconfig similarity index 100% rename from test_shard/iris_tester/example/macos/Runner/Configs/Warnings.xcconfig rename to tests/iris_tester/example/macos/Runner/Configs/Warnings.xcconfig diff --git a/test_shard/integration_test_app/macos/Runner/DebugProfile.entitlements b/tests/iris_tester/example/macos/Runner/DebugProfile.entitlements similarity index 67% rename from test_shard/integration_test_app/macos/Runner/DebugProfile.entitlements rename to tests/iris_tester/example/macos/Runner/DebugProfile.entitlements index e92c0f0..dddb8a3 100644 --- a/test_shard/integration_test_app/macos/Runner/DebugProfile.entitlements +++ b/tests/iris_tester/example/macos/Runner/DebugProfile.entitlements @@ -6,12 +6,6 @@ com.apple.security.cs.allow-jit - com.apple.security.device.audio-input - - com.apple.security.device.camera - - com.apple.security.network.client - com.apple.security.network.server diff --git a/test_shard/integration_test_app/macos/Runner/Info.plist b/tests/iris_tester/example/macos/Runner/Info.plist similarity index 89% rename from test_shard/integration_test_app/macos/Runner/Info.plist rename to tests/iris_tester/example/macos/Runner/Info.plist index 52fbfa0..4789daa 100644 --- a/test_shard/integration_test_app/macos/Runner/Info.plist +++ b/tests/iris_tester/example/macos/Runner/Info.plist @@ -22,14 +22,10 @@ $(FLUTTER_BUILD_NUMBER) LSMinimumSystemVersion $(MACOSX_DEPLOYMENT_TARGET) - NSCameraUsageDescription - CAM NSHumanReadableCopyright $(PRODUCT_COPYRIGHT) NSMainNibFile MainMenu - NSMicrophoneUsageDescription - MIC NSPrincipalClass NSApplication diff --git a/test_shard/integration_test_app/macos/Runner/MainFlutterWindow.swift b/tests/iris_tester/example/macos/Runner/MainFlutterWindow.swift similarity index 100% rename from test_shard/integration_test_app/macos/Runner/MainFlutterWindow.swift rename to tests/iris_tester/example/macos/Runner/MainFlutterWindow.swift diff --git a/test_shard/integration_test_app/macos/Runner/Release.entitlements b/tests/iris_tester/example/macos/Runner/Release.entitlements similarity index 51% rename from test_shard/integration_test_app/macos/Runner/Release.entitlements rename to tests/iris_tester/example/macos/Runner/Release.entitlements index 0a36428..852fa1a 100644 --- a/test_shard/integration_test_app/macos/Runner/Release.entitlements +++ b/tests/iris_tester/example/macos/Runner/Release.entitlements @@ -4,13 +4,5 @@ com.apple.security.app-sandbox - com.apple.security.device.audio-input - - com.apple.security.device.camera - - com.apple.security.network.client - - com.apple.security.network.server - diff --git a/test_shard/iris_tester/example/pubspec.lock b/tests/iris_tester/example/pubspec.lock similarity index 75% rename from test_shard/iris_tester/example/pubspec.lock rename to tests/iris_tester/example/pubspec.lock index bcb4e10..4a275c9 100644 --- a/test_shard/iris_tester/example/pubspec.lock +++ b/tests/iris_tester/example/pubspec.lock @@ -6,7 +6,7 @@ packages: description: name: async sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.11.0" boolean_selector: @@ -14,7 +14,7 @@ packages: description: name: boolean_selector sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.1" characters: @@ -22,7 +22,7 @@ packages: description: name: characters sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.0" clock: @@ -30,7 +30,7 @@ packages: description: name: clock sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.1.1" collection: @@ -38,7 +38,7 @@ packages: description: name: collection sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.18.0" cupertino_icons: @@ -46,7 +46,7 @@ packages: description: name: cupertino_icons sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.0.8" fake_async: @@ -54,17 +54,17 @@ packages: description: name: fake_async sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.3.1" ffi: dependency: transitive description: name: ffi - sha256: "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21" - url: "https://pub.dev" + sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6" + url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.2" + version: "2.1.3" flutter: dependency: "direct main" description: flutter @@ -75,7 +75,7 @@ packages: description: name: flutter_lints sha256: a25a15ebbdfc33ab1cd26c63a6ee519df92338a9c10f122adda92938253bef04 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.0.3" flutter_test: @@ -100,31 +100,31 @@ packages: description: name: js sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.6.7" leak_tracker: dependency: transitive description: name: leak_tracker - sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a" - url: "https://pub.dev" + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + url: "https://pub.flutter-io.cn" source: hosted - version: "10.0.4" + version: "10.0.5" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8" - url: "https://pub.dev" + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + url: "https://pub.flutter-io.cn" source: hosted - version: "3.0.3" + version: "3.0.5" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "3.0.1" lints: @@ -132,7 +132,7 @@ packages: description: name: lints sha256: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.1" matcher: @@ -140,31 +140,31 @@ packages: description: name: matcher sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "0.12.16+1" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a" - url: "https://pub.dev" + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + url: "https://pub.flutter-io.cn" source: hosted - version: "0.8.0" + version: "0.11.1" meta: dependency: transitive description: name: meta - sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136" - url: "https://pub.dev" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + url: "https://pub.flutter-io.cn" source: hosted - version: "1.12.0" + version: "1.15.0" path: dependency: transitive description: name: path sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.9.0" plugin_platform_interface: @@ -172,7 +172,7 @@ packages: description: name: plugin_platform_interface sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.8" sky_engine: @@ -185,7 +185,7 @@ packages: description: name: source_span sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.10.0" stack_trace: @@ -193,7 +193,7 @@ packages: description: name: stack_trace sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.11.1" stream_channel: @@ -201,7 +201,7 @@ packages: description: name: stream_channel sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.2" string_scanner: @@ -209,7 +209,7 @@ packages: description: name: string_scanner sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.0" term_glyph: @@ -217,33 +217,33 @@ packages: description: name: term_glyph sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "1.2.1" test_api: dependency: transitive description: name: test_api - sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" - url: "https://pub.dev" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + url: "https://pub.flutter-io.cn" source: hosted - version: "0.7.0" + version: "0.7.2" vector_math: dependency: transitive description: name: vector_math sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" - url: "https://pub.dev" + url: "https://pub.flutter-io.cn" source: hosted version: "2.1.4" vm_service: dependency: transitive description: name: vm_service - sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec" - url: "https://pub.dev" + sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc + url: "https://pub.flutter-io.cn" source: hosted - version: "14.2.1" + version: "14.2.4" sdks: dart: ">=3.3.0 <4.0.0" flutter: ">=3.18.0-18.0.pre.54" diff --git a/test_shard/iris_tester/example/pubspec.yaml b/tests/iris_tester/example/pubspec.yaml similarity index 100% rename from test_shard/iris_tester/example/pubspec.yaml rename to tests/iris_tester/example/pubspec.yaml diff --git a/test_shard/iris_tester/example/test/widget_test.dart b/tests/iris_tester/example/test/widget_test.dart similarity index 100% rename from test_shard/iris_tester/example/test/widget_test.dart rename to tests/iris_tester/example/test/widget_test.dart diff --git a/test_shard/iris_tester/example/windows/.gitignore b/tests/iris_tester/example/windows/.gitignore similarity index 100% rename from test_shard/iris_tester/example/windows/.gitignore rename to tests/iris_tester/example/windows/.gitignore diff --git a/test_shard/iris_tester/example/windows/CMakeLists.txt b/tests/iris_tester/example/windows/CMakeLists.txt similarity index 100% rename from test_shard/iris_tester/example/windows/CMakeLists.txt rename to tests/iris_tester/example/windows/CMakeLists.txt diff --git a/test_shard/integration_test_app/windows/flutter/CMakeLists.txt b/tests/iris_tester/example/windows/flutter/CMakeLists.txt similarity index 100% rename from test_shard/integration_test_app/windows/flutter/CMakeLists.txt rename to tests/iris_tester/example/windows/flutter/CMakeLists.txt diff --git a/tests/iris_tester/example/windows/flutter/generated_plugin_registrant.cc b/tests/iris_tester/example/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..9a218e1 --- /dev/null +++ b/tests/iris_tester/example/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,14 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include + +void RegisterPlugins(flutter::PluginRegistry* registry) { + IrisTesterPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("IrisTesterPluginCApi")); +} diff --git a/test_shard/iris_tester/example/windows/flutter/generated_plugin_registrant.h b/tests/iris_tester/example/windows/flutter/generated_plugin_registrant.h similarity index 100% rename from test_shard/iris_tester/example/windows/flutter/generated_plugin_registrant.h rename to tests/iris_tester/example/windows/flutter/generated_plugin_registrant.h diff --git a/test_shard/iris_tester/example/windows/flutter/generated_plugins.cmake b/tests/iris_tester/example/windows/flutter/generated_plugins.cmake similarity index 100% rename from test_shard/iris_tester/example/windows/flutter/generated_plugins.cmake rename to tests/iris_tester/example/windows/flutter/generated_plugins.cmake diff --git a/test_shard/integration_test_app/windows/runner/CMakeLists.txt b/tests/iris_tester/example/windows/runner/CMakeLists.txt similarity index 100% rename from test_shard/integration_test_app/windows/runner/CMakeLists.txt rename to tests/iris_tester/example/windows/runner/CMakeLists.txt diff --git a/test_shard/iris_tester/example/windows/runner/Runner.rc b/tests/iris_tester/example/windows/runner/Runner.rc similarity index 100% rename from test_shard/iris_tester/example/windows/runner/Runner.rc rename to tests/iris_tester/example/windows/runner/Runner.rc diff --git a/test_shard/integration_test_app/windows/runner/flutter_window.cpp b/tests/iris_tester/example/windows/runner/flutter_window.cpp similarity index 100% rename from test_shard/integration_test_app/windows/runner/flutter_window.cpp rename to tests/iris_tester/example/windows/runner/flutter_window.cpp diff --git a/test_shard/iris_tester/example/windows/runner/flutter_window.h b/tests/iris_tester/example/windows/runner/flutter_window.h similarity index 100% rename from test_shard/iris_tester/example/windows/runner/flutter_window.h rename to tests/iris_tester/example/windows/runner/flutter_window.h diff --git a/test_shard/iris_tester/example/windows/runner/main.cpp b/tests/iris_tester/example/windows/runner/main.cpp similarity index 100% rename from test_shard/iris_tester/example/windows/runner/main.cpp rename to tests/iris_tester/example/windows/runner/main.cpp diff --git a/test_shard/iris_tester/example/windows/runner/resource.h b/tests/iris_tester/example/windows/runner/resource.h similarity index 100% rename from test_shard/iris_tester/example/windows/runner/resource.h rename to tests/iris_tester/example/windows/runner/resource.h diff --git a/test_shard/iris_tester/example/windows/runner/resources/app_icon.ico b/tests/iris_tester/example/windows/runner/resources/app_icon.ico similarity index 100% rename from test_shard/iris_tester/example/windows/runner/resources/app_icon.ico rename to tests/iris_tester/example/windows/runner/resources/app_icon.ico diff --git a/test_shard/integration_test_app/windows/runner/runner.exe.manifest b/tests/iris_tester/example/windows/runner/runner.exe.manifest similarity index 100% rename from test_shard/integration_test_app/windows/runner/runner.exe.manifest rename to tests/iris_tester/example/windows/runner/runner.exe.manifest diff --git a/test_shard/integration_test_app/windows/runner/utils.cpp b/tests/iris_tester/example/windows/runner/utils.cpp similarity index 100% rename from test_shard/integration_test_app/windows/runner/utils.cpp rename to tests/iris_tester/example/windows/runner/utils.cpp diff --git a/test_shard/iris_tester/example/windows/runner/utils.h b/tests/iris_tester/example/windows/runner/utils.h similarity index 100% rename from test_shard/iris_tester/example/windows/runner/utils.h rename to tests/iris_tester/example/windows/runner/utils.h diff --git a/test_shard/integration_test_app/windows/runner/win32_window.cpp b/tests/iris_tester/example/windows/runner/win32_window.cpp similarity index 100% rename from test_shard/integration_test_app/windows/runner/win32_window.cpp rename to tests/iris_tester/example/windows/runner/win32_window.cpp diff --git a/test_shard/integration_test_app/windows/runner/win32_window.h b/tests/iris_tester/example/windows/runner/win32_window.h similarity index 100% rename from test_shard/integration_test_app/windows/runner/win32_window.h rename to tests/iris_tester/example/windows/runner/win32_window.h diff --git a/test_shard/iris_tester/ffigen.sh b/tests/iris_tester/ffigen.sh similarity index 100% rename from test_shard/iris_tester/ffigen.sh rename to tests/iris_tester/ffigen.sh diff --git a/test_shard/iris_tester/ffigen_config.yaml b/tests/iris_tester/ffigen_config.yaml similarity index 100% rename from test_shard/iris_tester/ffigen_config.yaml rename to tests/iris_tester/ffigen_config.yaml diff --git a/test_shard/iris_tester/ios/.gitignore b/tests/iris_tester/ios/.gitignore similarity index 100% rename from test_shard/iris_tester/ios/.gitignore rename to tests/iris_tester/ios/.gitignore diff --git a/test_shard/iris_tester/ios/Assets/.gitkeep b/tests/iris_tester/ios/Assets/.gitkeep similarity index 100% rename from test_shard/iris_tester/ios/Assets/.gitkeep rename to tests/iris_tester/ios/Assets/.gitkeep diff --git a/test_shard/iris_tester/ios/Classes/IrisTesterPlugin.h b/tests/iris_tester/ios/Classes/IrisTesterPlugin.h similarity index 100% rename from test_shard/iris_tester/ios/Classes/IrisTesterPlugin.h rename to tests/iris_tester/ios/Classes/IrisTesterPlugin.h diff --git a/test_shard/iris_tester/ios/Classes/IrisTesterPlugin.m b/tests/iris_tester/ios/Classes/IrisTesterPlugin.m similarity index 100% rename from test_shard/iris_tester/ios/Classes/IrisTesterPlugin.m rename to tests/iris_tester/ios/Classes/IrisTesterPlugin.m diff --git a/test_shard/iris_tester/ios/Classes/SwiftIrisTesterPlugin.swift b/tests/iris_tester/ios/Classes/SwiftIrisTesterPlugin.swift similarity index 100% rename from test_shard/iris_tester/ios/Classes/SwiftIrisTesterPlugin.swift rename to tests/iris_tester/ios/Classes/SwiftIrisTesterPlugin.swift diff --git a/test_shard/iris_tester/ios/iris_tester.podspec b/tests/iris_tester/ios/iris_tester.podspec similarity index 100% rename from test_shard/iris_tester/ios/iris_tester.podspec rename to tests/iris_tester/ios/iris_tester.podspec diff --git a/test_shard/iris_tester/lib/iris_tester.dart b/tests/iris_tester/lib/iris_tester.dart similarity index 100% rename from test_shard/iris_tester/lib/iris_tester.dart rename to tests/iris_tester/lib/iris_tester.dart diff --git a/test_shard/iris_tester/lib/iris_tester_web.dart b/tests/iris_tester/lib/iris_tester_web.dart similarity index 100% rename from test_shard/iris_tester/lib/iris_tester_web.dart rename to tests/iris_tester/lib/iris_tester_web.dart diff --git a/test_shard/iris_tester/lib/src/iris_tester_bindings.dart b/tests/iris_tester/lib/src/iris_tester_bindings.dart similarity index 100% rename from test_shard/iris_tester/lib/src/iris_tester_bindings.dart rename to tests/iris_tester/lib/src/iris_tester_bindings.dart diff --git a/test_shard/iris_tester/lib/src/platform/io/iris_tester_actual_io.dart b/tests/iris_tester/lib/src/platform/io/iris_tester_actual_io.dart similarity index 100% rename from test_shard/iris_tester/lib/src/platform/io/iris_tester_actual_io.dart rename to tests/iris_tester/lib/src/platform/io/iris_tester_actual_io.dart diff --git a/test_shard/iris_tester/lib/src/platform/io/iris_tester_io.dart b/tests/iris_tester/lib/src/platform/io/iris_tester_io.dart similarity index 100% rename from test_shard/iris_tester/lib/src/platform/io/iris_tester_io.dart rename to tests/iris_tester/lib/src/platform/io/iris_tester_io.dart diff --git a/test_shard/iris_tester/lib/src/platform/io/iris_tester_rtm_bindings.dart b/tests/iris_tester/lib/src/platform/io/iris_tester_rtm_bindings.dart similarity index 100% rename from test_shard/iris_tester/lib/src/platform/io/iris_tester_rtm_bindings.dart rename to tests/iris_tester/lib/src/platform/io/iris_tester_rtm_bindings.dart diff --git a/test_shard/iris_tester/lib/src/platform/iris_tester_expect.dart b/tests/iris_tester/lib/src/platform/iris_tester_expect.dart similarity index 100% rename from test_shard/iris_tester/lib/src/platform/iris_tester_expect.dart rename to tests/iris_tester/lib/src/platform/iris_tester_expect.dart diff --git a/test_shard/iris_tester/lib/src/platform/iris_tester_interface.dart b/tests/iris_tester/lib/src/platform/iris_tester_interface.dart similarity index 100% rename from test_shard/iris_tester/lib/src/platform/iris_tester_interface.dart rename to tests/iris_tester/lib/src/platform/iris_tester_interface.dart diff --git a/test_shard/iris_tester/lib/src/platform/web/iris_tester_actual_web.dart b/tests/iris_tester/lib/src/platform/web/iris_tester_actual_web.dart similarity index 100% rename from test_shard/iris_tester/lib/src/platform/web/iris_tester_actual_web.dart rename to tests/iris_tester/lib/src/platform/web/iris_tester_actual_web.dart diff --git a/test_shard/iris_tester/lib/src/platform/web/iris_tester_bindings_web.dart b/tests/iris_tester/lib/src/platform/web/iris_tester_bindings_web.dart similarity index 100% rename from test_shard/iris_tester/lib/src/platform/web/iris_tester_bindings_web.dart rename to tests/iris_tester/lib/src/platform/web/iris_tester_bindings_web.dart diff --git a/test_shard/iris_tester/lib/src/platform/web/iris_tester_web.dart b/tests/iris_tester/lib/src/platform/web/iris_tester_web.dart similarity index 100% rename from test_shard/iris_tester/lib/src/platform/web/iris_tester_web.dart rename to tests/iris_tester/lib/src/platform/web/iris_tester_web.dart diff --git a/test_shard/iris_tester/macos/Classes/File.swift b/tests/iris_tester/macos/Classes/File.swift similarity index 100% rename from test_shard/iris_tester/macos/Classes/File.swift rename to tests/iris_tester/macos/Classes/File.swift diff --git a/test_shard/iris_tester/macos/Classes/IrisTesterPlugin.h b/tests/iris_tester/macos/Classes/IrisTesterPlugin.h similarity index 100% rename from test_shard/iris_tester/macos/Classes/IrisTesterPlugin.h rename to tests/iris_tester/macos/Classes/IrisTesterPlugin.h diff --git a/test_shard/iris_tester/macos/Classes/IrisTesterPlugin.m b/tests/iris_tester/macos/Classes/IrisTesterPlugin.m similarity index 100% rename from test_shard/iris_tester/macos/Classes/IrisTesterPlugin.m rename to tests/iris_tester/macos/Classes/IrisTesterPlugin.m diff --git a/test_shard/iris_tester/macos/iris_tester.podspec b/tests/iris_tester/macos/iris_tester.podspec similarity index 100% rename from test_shard/iris_tester/macos/iris_tester.podspec rename to tests/iris_tester/macos/iris_tester.podspec diff --git a/test_shard/iris_tester/pubspec.yaml b/tests/iris_tester/pubspec.yaml similarity index 100% rename from test_shard/iris_tester/pubspec.yaml rename to tests/iris_tester/pubspec.yaml diff --git a/test_shard/iris_tester/windows/.gitignore b/tests/iris_tester/windows/.gitignore similarity index 100% rename from test_shard/iris_tester/windows/.gitignore rename to tests/iris_tester/windows/.gitignore diff --git a/test_shard/iris_tester/windows/CMakeLists.txt b/tests/iris_tester/windows/CMakeLists.txt similarity index 100% rename from test_shard/iris_tester/windows/CMakeLists.txt rename to tests/iris_tester/windows/CMakeLists.txt diff --git a/test_shard/iris_tester/windows/include/iris_tester/iris_tester_plugin_c_api.h b/tests/iris_tester/windows/include/iris_tester/iris_tester_plugin_c_api.h similarity index 100% rename from test_shard/iris_tester/windows/include/iris_tester/iris_tester_plugin_c_api.h rename to tests/iris_tester/windows/include/iris_tester/iris_tester_plugin_c_api.h diff --git a/test_shard/iris_tester/windows/iris_tester_plugin.cpp b/tests/iris_tester/windows/iris_tester_plugin.cpp similarity index 100% rename from test_shard/iris_tester/windows/iris_tester_plugin.cpp rename to tests/iris_tester/windows/iris_tester_plugin.cpp diff --git a/test_shard/iris_tester/windows/iris_tester_plugin.h b/tests/iris_tester/windows/iris_tester_plugin.h similarity index 100% rename from test_shard/iris_tester/windows/iris_tester_plugin.h rename to tests/iris_tester/windows/iris_tester_plugin.h diff --git a/test_shard/iris_tester/windows/iris_tester_plugin_c_api.cpp b/tests/iris_tester/windows/iris_tester_plugin_c_api.cpp similarity index 100% rename from test_shard/iris_tester/windows/iris_tester_plugin_c_api.cpp rename to tests/iris_tester/windows/iris_tester_plugin_c_api.cpp