Skip to content

Commit 4bcf555

Browse files
mvanbeusekomEgor
mvanbeusekom
authored and
Egor
committed
[camera] Move camera to camera/camera (flutter#3258)
* Move camera to camera/camera * Fix relative path after move * Rebased with master and update version * Update homepage * Skip XCTESTS for the camera/camera plugin
1 parent abf2a89 commit 4bcf555

File tree

85 files changed

+8
-4
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+8
-4
lines changed

‎.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ task:
163163
- name: build-ipas+drive-examples
164164
env:
165165
PATH: $PATH:/usr/local/bin
166-
PLUGINS_TO_SKIP_XCTESTS: "battery/battery,camera,connectivity/connectivity,device_info/device_info,espresso,google_maps_flutter/google_maps_flutter,google_sign_in/google_sign_in,in_app_purchase,integration_test,ios_platform_images,local_auth,package_info,path_provider/path_provider,quick_actions,sensors,shared_preferences/shared_preferences,url_launcher/url_launcher,video_player/video_player,webview_flutter,wifi_info_flutter/wifi_info_flutter"
166+
PLUGINS_TO_SKIP_XCTESTS: "battery/battery,camera/camera,connectivity/connectivity,device_info/device_info,espresso,google_maps_flutter/google_maps_flutter,google_sign_in/google_sign_in,in_app_purchase,integration_test,ios_platform_images,local_auth,package_info,path_provider/path_provider,quick_actions,sensors,shared_preferences/shared_preferences,url_launcher/url_launcher,video_player/video_player,webview_flutter,wifi_info_flutter/wifi_info_flutter"
167167
matrix:
168168
PLUGIN_SHARDING: "--shardIndex 0 --shardCount 4"
169169
PLUGIN_SHARDING: "--shardIndex 1 --shardCount 4"

‎packages/camera/CHANGELOG.md renamed to ‎packages/camera/camera/CHANGELOG.md

Lines changed: 4 additions & 0 deletions

‎packages/camera/LICENSE renamed to ‎packages/camera/camera/LICENSE

File renamed without changes.

‎packages/camera/README.md renamed to ‎packages/camera/camera/README.md

‎packages/camera/android/build.gradle renamed to ‎packages/camera/camera/android/build.gradle

File renamed without changes.

‎packages/camera/android/gradle.properties renamed to ‎packages/camera/camera/android/gradle.properties

File renamed without changes.

‎packages/camera/android/settings.gradle renamed to ‎packages/camera/camera/android/settings.gradle

File renamed without changes.

‎packages/camera/android/src/main/AndroidManifest.xml renamed to ‎packages/camera/camera/android/src/main/AndroidManifest.xml

File renamed without changes.

‎packages/camera/android/src/main/java/io/flutter/plugins/camera/Camera.java renamed to ‎packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/Camera.java

File renamed without changes.

‎packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPermissions.java renamed to ‎packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/CameraPermissions.java

File renamed without changes.

‎packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java renamed to ‎packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/CameraPlugin.java

File renamed without changes.

‎packages/camera/android/src/main/java/io/flutter/plugins/camera/CameraUtils.java renamed to ‎packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/CameraUtils.java

File renamed without changes.

‎packages/camera/android/src/main/java/io/flutter/plugins/camera/DartMessenger.java renamed to ‎packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/DartMessenger.java

File renamed without changes.

‎packages/camera/android/src/main/java/io/flutter/plugins/camera/MethodCallHandlerImpl.java renamed to ‎packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/MethodCallHandlerImpl.java

File renamed without changes.

‎packages/camera/android/src/main/java/io/flutter/plugins/camera/media/MediaRecorderBuilder.java renamed to ‎packages/camera/camera/android/src/main/java/io/flutter/plugins/camera/media/MediaRecorderBuilder.java

File renamed without changes.

‎packages/camera/android/src/test/java/io/flutter/plugins/camera/CameraPermissionsTest.java renamed to ‎packages/camera/camera/android/src/test/java/io/flutter/plugins/camera/CameraPermissionsTest.java

File renamed without changes.

‎packages/camera/android/src/test/java/io/flutter/plugins/camera/DartMessengerTest.java renamed to ‎packages/camera/camera/android/src/test/java/io/flutter/plugins/camera/DartMessengerTest.java

File renamed without changes.

‎packages/camera/android/src/test/java/io/flutter/plugins/camera/media/MediaRecorderBuilderTest.java renamed to ‎packages/camera/camera/android/src/test/java/io/flutter/plugins/camera/media/MediaRecorderBuilderTest.java

File renamed without changes.

‎packages/camera/camera_android.iml renamed to ‎packages/camera/camera/camera_android.iml

File renamed without changes.

‎packages/camera/example/android.iml renamed to ‎packages/camera/camera/example/android.iml

File renamed without changes.

‎packages/camera/example/android/app/build.gradle renamed to ‎packages/camera/camera/example/android/app/build.gradle

File renamed without changes.

‎packages/camera/example/android/app/gradle/wrapper/gradle-wrapper.properties renamed to ‎packages/camera/camera/example/android/app/gradle/wrapper/gradle-wrapper.properties

File renamed without changes.

‎packages/camera/example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/EmbeddingV1ActivityTest.java renamed to ‎packages/camera/camera/example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/EmbeddingV1ActivityTest.java

File renamed without changes.

‎packages/camera/example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/FlutterActivityTest.java renamed to ‎packages/camera/camera/example/android/app/src/androidTestDebug/java/io/flutter/plugins/cameraexample/FlutterActivityTest.java

File renamed without changes.

‎packages/camera/example/android/app/src/main/AndroidManifest.xml renamed to ‎packages/camera/camera/example/android/app/src/main/AndroidManifest.xml

File renamed without changes.

‎packages/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java renamed to ‎packages/camera/camera/example/android/app/src/main/java/io/flutter/plugins/cameraexample/EmbeddingV1Activity.java

File renamed without changes.

‎packages/camera/example/android/app/src/main/res/drawable/launch_background.xml renamed to ‎packages/camera/camera/example/android/app/src/main/res/drawable/launch_background.xml

File renamed without changes.

‎packages/camera/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png renamed to ‎packages/camera/camera/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png

File renamed without changes.

‎packages/camera/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png renamed to ‎packages/camera/camera/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png

File renamed without changes.

‎packages/camera/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png renamed to ‎packages/camera/camera/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png

File renamed without changes.

‎packages/camera/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png renamed to ‎packages/camera/camera/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png

File renamed without changes.

‎packages/camera/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png renamed to ‎packages/camera/camera/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png

File renamed without changes.

‎packages/camera/example/android/app/src/main/res/values/styles.xml renamed to ‎packages/camera/camera/example/android/app/src/main/res/values/styles.xml

File renamed without changes.

‎packages/camera/example/android/build.gradle renamed to ‎packages/camera/camera/example/android/build.gradle

File renamed without changes.

‎packages/camera/example/android/gradle.properties renamed to ‎packages/camera/camera/example/android/gradle.properties

File renamed without changes.

‎packages/camera/example/android/gradle/wrapper/gradle-wrapper.properties renamed to ‎packages/camera/camera/example/android/gradle/wrapper/gradle-wrapper.properties

File renamed without changes.

‎packages/camera/example/android/settings.gradle renamed to ‎packages/camera/camera/example/android/settings.gradle

File renamed without changes.

‎packages/camera/example/camera_example.iml renamed to ‎packages/camera/camera/example/camera_example.iml

File renamed without changes.

‎packages/camera/example/camera_example_android.iml renamed to ‎packages/camera/camera/example/camera_example_android.iml

File renamed without changes.

‎packages/camera/example/integration_test/camera_test.dart renamed to ‎packages/camera/camera/example/integration_test/camera_test.dart

File renamed without changes.

‎packages/camera/example/ios/Flutter/AppFrameworkInfo.plist renamed to ‎packages/camera/camera/example/ios/Flutter/AppFrameworkInfo.plist

File renamed without changes.

‎packages/camera/example/ios/Flutter/Debug.xcconfig renamed to ‎packages/camera/camera/example/ios/Flutter/Debug.xcconfig

File renamed without changes.

‎packages/camera/example/ios/Flutter/Release.xcconfig renamed to ‎packages/camera/camera/example/ios/Flutter/Release.xcconfig

File renamed without changes.

‎packages/camera/example/ios/Runner.xcodeproj/project.pbxproj renamed to ‎packages/camera/camera/example/ios/Runner.xcodeproj/project.pbxproj

File renamed without changes.

‎packages/camera/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata renamed to ‎packages/camera/camera/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata

File renamed without changes.

‎packages/camera/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme renamed to ‎packages/camera/camera/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

File renamed without changes.

‎packages/camera/example/ios/Runner.xcworkspace/contents.xcworkspacedata renamed to ‎packages/camera/camera/example/ios/Runner.xcworkspace/contents.xcworkspacedata

File renamed without changes.

‎packages/camera/example/ios/Runner/AppDelegate.h renamed to ‎packages/camera/camera/example/ios/Runner/AppDelegate.h

File renamed without changes.

‎packages/camera/example/ios/Runner/AppDelegate.m renamed to ‎packages/camera/camera/example/ios/Runner/AppDelegate.m

File renamed without changes.

‎packages/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json renamed to ‎packages/camera/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

File renamed without changes.

‎packages/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] renamed to ‎packages/camera/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]

File renamed without changes.

‎packages/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] renamed to ‎packages/camera/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]

File renamed without changes.

‎packages/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] renamed to ‎packages/camera/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]

File renamed without changes.

‎packages/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] renamed to ‎packages/camera/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]

File renamed without changes.

‎packages/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] renamed to ‎packages/camera/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]

File renamed without changes.

‎packages/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] renamed to ‎packages/camera/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]

File renamed without changes.

‎packages/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] renamed to ‎packages/camera/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]

File renamed without changes.

‎packages/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] renamed to ‎packages/camera/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]

File renamed without changes.

‎packages/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] renamed to ‎packages/camera/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]

File renamed without changes.

‎packages/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] renamed to ‎packages/camera/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]

File renamed without changes.

‎packages/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] renamed to ‎packages/camera/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]

File renamed without changes.

‎packages/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] renamed to ‎packages/camera/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]

File renamed without changes.

‎packages/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] renamed to ‎packages/camera/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]

File renamed without changes.

‎packages/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected] renamed to ‎packages/camera/camera/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]

File renamed without changes.

‎packages/camera/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json renamed to ‎packages/camera/camera/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json

File renamed without changes.

‎packages/camera/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png renamed to ‎packages/camera/camera/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png

File renamed without changes.

‎packages/camera/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected] renamed to ‎packages/camera/camera/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]

File renamed without changes.

‎packages/camera/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected] renamed to ‎packages/camera/camera/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/[email protected]

File renamed without changes.

‎packages/camera/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md renamed to ‎packages/camera/camera/example/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md

‎packages/camera/example/ios/Runner/Base.lproj/LaunchScreen.storyboard renamed to ‎packages/camera/camera/example/ios/Runner/Base.lproj/LaunchScreen.storyboard

File renamed without changes.

‎packages/camera/example/ios/Runner/Base.lproj/Main.storyboard renamed to ‎packages/camera/camera/example/ios/Runner/Base.lproj/Main.storyboard

File renamed without changes.

‎packages/camera/example/ios/Runner/Info.plist renamed to ‎packages/camera/camera/example/ios/Runner/Info.plist

File renamed without changes.

‎packages/camera/example/ios/Runner/main.m renamed to ‎packages/camera/camera/example/ios/Runner/main.m

File renamed without changes.

‎packages/camera/example/lib/main.dart renamed to ‎packages/camera/camera/example/lib/main.dart

File renamed without changes.

‎packages/camera/example/pubspec.yaml renamed to ‎packages/camera/camera/example/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies:
99
sdk: flutter
1010
video_player: ^0.10.0
1111
integration_test:
12-
path: ../../integration_test
12+
path: ../../../integration_test
1313

1414
dev_dependencies:
1515
flutter_test:

‎packages/camera/example/test_driver/integration_test.dart renamed to ‎packages/camera/camera/example/test_driver/integration_test.dart

File renamed without changes.

‎packages/camera/ios/Assets/.gitkeep renamed to ‎packages/camera/camera/ios/Assets/.gitkeep

File renamed without changes.

‎packages/camera/ios/Classes/CameraPlugin.h renamed to ‎packages/camera/camera/ios/Classes/CameraPlugin.h

File renamed without changes.

‎packages/camera/ios/Classes/CameraPlugin.m renamed to ‎packages/camera/camera/ios/Classes/CameraPlugin.m

File renamed without changes.

‎packages/camera/ios/Tests/CameraPluginTests.m renamed to ‎packages/camera/camera/ios/Tests/CameraPluginTests.m

File renamed without changes.

‎packages/camera/ios/camera.podspec renamed to ‎packages/camera/camera/ios/camera.podspec

File renamed without changes.

‎packages/camera/lib/camera.dart renamed to ‎packages/camera/camera/lib/camera.dart

File renamed without changes.

‎packages/camera/lib/camera_image.dart renamed to ‎packages/camera/camera/lib/camera_image.dart

File renamed without changes.

‎packages/camera/pubspec.yaml renamed to ‎packages/camera/camera/pubspec.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ name: camera
22
description: A Flutter plugin for getting information about and controlling the
33
camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video,
44
and streaming image buffers to dart.
5-
version: 0.5.8+15
6-
homepage: https://github.com/flutter/plugins/tree/master/packages/camera
5+
version: 0.5.8+16
6+
homepage: https://github.com/flutter/plugins/tree/master/packages/camera/camera
77

88
dependencies:
99
flutter:

‎packages/camera/test/camera_test.dart renamed to ‎packages/camera/camera/test/camera_test.dart

File renamed without changes.

0 commit comments

Comments
 (0)