flutter · ditman · Aug 12, 2020 · Aug 11, 2020 · Aug 12, 2020 · Aug 12, 2020
diff --git a/packages/device_info/CHANGELOG.md → ...ages/device_info/device_info/CHANGELOG.md b/packages/device_info/CHANGELOG.md → ...ages/device_info/device_info/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.2+6
+
+* Moved everything from device_info to device_info/device_info
+
 ## 0.4.2+5
 
 * Update package:e2e reference to use the local version in the flutter/plugins

diff --git a/packages/device_info/LICENSE → packages/device_info/device_info/LICENSE b/packages/device_info/LICENSE → packages/device_info/device_info/LICENSE
diff --git a/packages/device_info/README.md → packages/device_info/device_info/README.md b/packages/device_info/README.md → packages/device_info/device_info/README.md
diff --git a/packages/device_info/android/build.gradle → ...ice_info/device_info/android/build.gradle b/packages/device_info/android/build.gradle → ...ice_info/device_info/android/build.gradle
diff --git a/...ges/device_info/android/gradle.properties → ...nfo/device_info/android/gradle.properties b/...ges/device_info/android/gradle.properties → ...nfo/device_info/android/gradle.properties
diff --git a/packages/device_info/android/settings.gradle → ..._info/device_info/android/settings.gradle b/packages/device_info/android/settings.gradle → ..._info/device_info/android/settings.gradle
diff --git a/...info/android/src/main/AndroidManifest.xml → ...info/android/src/main/AndroidManifest.xml b/...info/android/src/main/AndroidManifest.xml → ...info/android/src/main/AndroidManifest.xml
diff --git a/.../plugins/deviceinfo/DeviceInfoPlugin.java → .../plugins/deviceinfo/DeviceInfoPlugin.java b/.../plugins/deviceinfo/DeviceInfoPlugin.java → .../plugins/deviceinfo/DeviceInfoPlugin.java
diff --git a/...ins/deviceinfo/MethodCallHandlerImpl.java → ...ins/deviceinfo/MethodCallHandlerImpl.java b/...ins/deviceinfo/MethodCallHandlerImpl.java → ...ins/deviceinfo/MethodCallHandlerImpl.java
diff --git a/packages/device_info/example/README.md → ...device_info/device_info/example/README.md b/packages/device_info/example/README.md → ...device_info/device_info/example/README.md
diff --git a/...ice_info/example/android/app/build.gradle → ...ice_info/example/android/app/build.gradle b/...ice_info/example/android/app/build.gradle → ...ice_info/example/android/app/build.gradle
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/.../android/app/src/main/AndroidManifest.xml → .../android/app/src/main/AndroidManifest.xml b/.../android/app/src/main/AndroidManifest.xml → .../android/app/src/main/AndroidManifest.xml
diff --git a/...eviceinfoexample/EmbeddingV1Activity.java → ...eviceinfoexample/EmbeddingV1Activity.java b/...eviceinfoexample/EmbeddingV1Activity.java → ...eviceinfoexample/EmbeddingV1Activity.java
diff --git a/...einfoexample/EmbeddingV1ActivityTest.java → ...einfoexample/EmbeddingV1ActivityTest.java b/...einfoexample/EmbeddingV1ActivityTest.java → ...einfoexample/EmbeddingV1ActivityTest.java
diff --git a/.../src/main/res/mipmap-hdpi/ic_launcher.png → .../src/main/res/mipmap-hdpi/ic_launcher.png b/.../src/main/res/mipmap-hdpi/ic_launcher.png → .../src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/.../src/main/res/mipmap-mdpi/ic_launcher.png → .../src/main/res/mipmap-mdpi/ic_launcher.png b/.../src/main/res/mipmap-mdpi/ic_launcher.png → .../src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/...src/main/res/mipmap-xhdpi/ic_launcher.png → ...src/main/res/mipmap-xhdpi/ic_launcher.png b/...src/main/res/mipmap-xhdpi/ic_launcher.png → ...src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/...rc/main/res/mipmap-xxhdpi/ic_launcher.png → ...rc/main/res/mipmap-xxhdpi/ic_launcher.png b/...rc/main/res/mipmap-xxhdpi/ic_launcher.png → ...rc/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/...c/main/res/mipmap-xxxhdpi/ic_launcher.png → ...c/main/res/mipmap-xxxhdpi/ic_launcher.png b/...c/main/res/mipmap-xxxhdpi/ic_launcher.png → ...c/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/.../device_info/example/android/build.gradle → .../device_info/example/android/build.gradle b/.../device_info/example/android/build.gradle → .../device_info/example/android/build.gradle
diff --git a/...ce_info/example/android/gradle.properties → ...ce_info/example/android/gradle.properties b/...ce_info/example/android/gradle.properties → ...ce_info/example/android/gradle.properties
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/...vice_info/example/android/settings.gradle → ...vice_info/example/android/settings.gradle b/...vice_info/example/android/settings.gradle → ...vice_info/example/android/settings.gradle
diff --git a/...xample/ios/Flutter/AppFrameworkInfo.plist → ...xample/ios/Flutter/AppFrameworkInfo.plist b/...xample/ios/Flutter/AppFrameworkInfo.plist → ...xample/ios/Flutter/AppFrameworkInfo.plist
diff --git a/...e_info/example/ios/Flutter/Debug.xcconfig → ...e_info/example/ios/Flutter/Debug.xcconfig b/...e_info/example/ios/Flutter/Debug.xcconfig → ...e_info/example/ios/Flutter/Debug.xcconfig
diff --git a/...info/example/ios/Flutter/Release.xcconfig → ...info/example/ios/Flutter/Release.xcconfig b/...info/example/ios/Flutter/Release.xcconfig → ...info/example/ios/Flutter/Release.xcconfig
diff --git a/...mple/ios/Runner.xcodeproj/project.pbxproj → ...mple/ios/Runner.xcodeproj/project.pbxproj b/...mple/ios/Runner.xcodeproj/project.pbxproj → ...mple/ios/Runner.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...oj/xcshareddata/xcschemes/Runner.xcscheme → ...oj/xcshareddata/xcschemes/Runner.xcscheme b/...oj/xcshareddata/xcschemes/Runner.xcscheme → ...oj/xcshareddata/xcschemes/Runner.xcscheme
diff --git a/...nner.xcworkspace/contents.xcworkspacedata → ...nner.xcworkspace/contents.xcworkspacedata b/...nner.xcworkspace/contents.xcworkspacedata → ...nner.xcworkspace/contents.xcworkspacedata
diff --git a/...ice_info/example/ios/Runner/AppDelegate.h → ...ice_info/example/ios/Runner/AppDelegate.h b/...ice_info/example/ios/Runner/AppDelegate.h → ...ice_info/example/ios/Runner/AppDelegate.h
diff --git a/...ice_info/example/ios/Runner/AppDelegate.m → ...ice_info/example/ios/Runner/AppDelegate.m b/...ice_info/example/ios/Runner/AppDelegate.m → ...ice_info/example/ios/Runner/AppDelegate.m
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected] b/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected]
diff --git a/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected] b/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected]
diff --git a/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected] b/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected]
diff --git a/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected] b/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected]
diff --git a/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected] b/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected]
diff --git a/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected] b/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected]
diff --git a/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected] b/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected]
diff --git a/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected] b/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected]
diff --git a/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected] b/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected]
diff --git a/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected] b/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected]
diff --git a/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected] b/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected]
diff --git a/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected] b/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected]
diff --git a/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected] b/.../AppIcon.appiconset/[email protected] → .../AppIcon.appiconset/[email protected]
diff --git a/...Icon.appiconset/[email protected] → ...Icon.appiconset/[email protected] b/...Icon.appiconset/[email protected] → ...Icon.appiconset/[email protected]
diff --git a/...Runner/Base.lproj/LaunchScreen.storyboard → ...Runner/Base.lproj/LaunchScreen.storyboard b/...Runner/Base.lproj/LaunchScreen.storyboard → ...Runner/Base.lproj/LaunchScreen.storyboard
diff --git a/...ple/ios/Runner/Base.lproj/Main.storyboard → ...ple/ios/Runner/Base.lproj/Main.storyboard b/...ple/ios/Runner/Base.lproj/Main.storyboard → ...ple/ios/Runner/Base.lproj/Main.storyboard
diff --git a/...device_info/example/ios/Runner/Info.plist → ...device_info/example/ios/Runner/Info.plist b/...device_info/example/ios/Runner/Info.plist → ...device_info/example/ios/Runner/Info.plist
diff --git a/...ges/device_info/example/ios/Runner/main.m → ...nfo/device_info/example/ios/Runner/main.m b/...ges/device_info/example/ios/Runner/main.m → ...nfo/device_info/example/ios/Runner/main.m
diff --git a/packages/device_info/example/lib/main.dart → ...ce_info/device_info/example/lib/main.dart b/packages/device_info/example/lib/main.dart → ...ce_info/device_info/example/lib/main.dart
diff --git a/packages/device_info/example/pubspec.yaml → ...ice_info/device_info/example/pubspec.yaml b/packages/device_info/example/pubspec.yaml → ...ice_info/device_info/example/pubspec.yaml
@@ -4,14 +4,13 @@ description: Demonstrates how to use the device_info plugin.
 dependencies:
   flutter:
     sdk: flutter
+  e2e:
   device_info:
     path: ../
 
 dev_dependencies:
   flutter_driver:
     sdk: flutter
-  e2e:
-    path: ../../e2e
   pedantic: ^1.8.0
 
 flutter:

diff --git a/.../example/test_driver/device_info_e2e.dart → .../example/test_driver/device_info_e2e.dart b/.../example/test_driver/device_info_e2e.dart → .../example/test_driver/device_info_e2e.dart
diff --git a/...ple/test_driver/device_info_e2e_test.dart → ...ple/test_driver/device_info_e2e_test.dart b/...ple/test_driver/device_info_e2e_test.dart → ...ple/test_driver/device_info_e2e_test.dart
diff --git a/packages/device_info/ios/Assets/.gitkeep → ...vice_info/device_info/ios/Assets/.gitkeep b/packages/device_info/ios/Assets/.gitkeep → ...vice_info/device_info/ios/Assets/.gitkeep
diff --git a/...ce_info/ios/Classes/FLTDeviceInfoPlugin.h → ...ce_info/ios/Classes/FLTDeviceInfoPlugin.h b/...ce_info/ios/Classes/FLTDeviceInfoPlugin.h → ...ce_info/ios/Classes/FLTDeviceInfoPlugin.h
diff --git a/...ce_info/ios/Classes/FLTDeviceInfoPlugin.m → ...ce_info/ios/Classes/FLTDeviceInfoPlugin.m b/...ce_info/ios/Classes/FLTDeviceInfoPlugin.m → ...ce_info/ios/Classes/FLTDeviceInfoPlugin.m
diff --git a/packages/device_info/ios/device_info.podspec → ..._info/device_info/ios/device_info.podspec b/packages/device_info/ios/device_info.podspec → ..._info/device_info/ios/device_info.podspec
diff --git a/packages/device_info/lib/device_info.dart → ...ice_info/device_info/lib/device_info.dart b/packages/device_info/lib/device_info.dart → ...ice_info/device_info/lib/device_info.dart
diff --git a/packages/device_info/pubspec.yaml → ...ages/device_info/device_info/pubspec.yaml b/packages/device_info/pubspec.yaml → ...ages/device_info/device_info/pubspec.yaml
@@ -5,7 +5,7 @@ homepage: https://github.com/flutter/plugins/tree/master/packages/device_info
 # 0.4.y+z is compatible with 1.0.0, if you land a breaking change bump
 # the version to 2.0.0.
 # See more details: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0
-version: 0.4.2+5
+version: 0.4.2+6
 
 flutter:
   plugin:

diff --git a/packages/device_info/device_info_android.iml b/packages/device_info/device_info_android.iml
diff --git a/packages/device_info/example/android.iml b/packages/device_info/example/android.iml
diff --git a/packages/device_info/example/device_info_example.iml b/packages/device_info/example/device_info_example.iml
diff --git a/packages/device_info/example/device_info_example_android.iml b/packages/device_info/example/device_info_example_android.iml