[device_info] Moved device_info to a subdir (#2923)
(This is preparation for the federation of the plugin)
diff --git a/packages/device_info/CHANGELOG.md b/packages/device_info/device_info/CHANGELOG.md
similarity index 97%
rename from packages/device_info/CHANGELOG.md
rename to packages/device_info/device_info/CHANGELOG.md
index 97c1e1f..9af7297 100644
--- a/packages/device_info/CHANGELOG.md
+++ b/packages/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 b/packages/device_info/device_info/LICENSE
similarity index 100%
rename from packages/device_info/LICENSE
rename to packages/device_info/device_info/LICENSE
diff --git a/packages/device_info/README.md b/packages/device_info/device_info/README.md
similarity index 100%
rename from packages/device_info/README.md
rename to packages/device_info/device_info/README.md
diff --git a/packages/device_info/android/build.gradle b/packages/device_info/device_info/android/build.gradle
similarity index 100%
rename from packages/device_info/android/build.gradle
rename to packages/device_info/device_info/android/build.gradle
diff --git a/packages/device_info/android/gradle.properties b/packages/device_info/device_info/android/gradle.properties
similarity index 100%
rename from packages/device_info/android/gradle.properties
rename to packages/device_info/device_info/android/gradle.properties
diff --git a/packages/device_info/android/settings.gradle b/packages/device_info/device_info/android/settings.gradle
similarity index 100%
rename from packages/device_info/android/settings.gradle
rename to packages/device_info/device_info/android/settings.gradle
diff --git a/packages/device_info/android/src/main/AndroidManifest.xml b/packages/device_info/device_info/android/src/main/AndroidManifest.xml
similarity index 100%
rename from packages/device_info/android/src/main/AndroidManifest.xml
rename to packages/device_info/device_info/android/src/main/AndroidManifest.xml
diff --git a/packages/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java b/packages/device_info/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java
similarity index 100%
rename from packages/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java
rename to packages/device_info/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/DeviceInfoPlugin.java
diff --git a/packages/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/MethodCallHandlerImpl.java b/packages/device_info/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/MethodCallHandlerImpl.java
similarity index 100%
rename from packages/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/MethodCallHandlerImpl.java
rename to packages/device_info/device_info/android/src/main/java/io/flutter/plugins/deviceinfo/MethodCallHandlerImpl.java
diff --git a/packages/device_info/example/README.md b/packages/device_info/device_info/example/README.md
similarity index 100%
rename from packages/device_info/example/README.md
rename to packages/device_info/device_info/example/README.md
diff --git a/packages/device_info/example/android/app/build.gradle b/packages/device_info/device_info/example/android/app/build.gradle
similarity index 100%
rename from packages/device_info/example/android/app/build.gradle
rename to packages/device_info/device_info/example/android/app/build.gradle
diff --git a/packages/device_info/example/android/app/gradle/wrapper/gradle-wrapper.properties b/packages/device_info/device_info/example/android/app/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from packages/device_info/example/android/app/gradle/wrapper/gradle-wrapper.properties
rename to packages/device_info/device_info/example/android/app/gradle/wrapper/gradle-wrapper.properties
diff --git a/packages/device_info/example/android/app/src/main/AndroidManifest.xml b/packages/device_info/device_info/example/android/app/src/main/AndroidManifest.xml
similarity index 100%
rename from packages/device_info/example/android/app/src/main/AndroidManifest.xml
rename to packages/device_info/device_info/example/android/app/src/main/AndroidManifest.xml
diff --git a/packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1Activity.java b/packages/device_info/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1Activity.java
similarity index 100%
rename from packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1Activity.java
rename to packages/device_info/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1Activity.java
diff --git a/packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1ActivityTest.java b/packages/device_info/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1ActivityTest.java
similarity index 100%
rename from packages/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1ActivityTest.java
rename to packages/device_info/device_info/example/android/app/src/main/java/io/flutter/plugins/deviceinfoexample/EmbeddingV1ActivityTest.java
diff --git a/packages/device_info/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/packages/device_info/device_info/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from packages/device_info/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to packages/device_info/device_info/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary files differ
diff --git a/packages/device_info/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/packages/device_info/device_info/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from packages/device_info/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
rename to packages/device_info/device_info/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary files differ
diff --git a/packages/device_info/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/packages/device_info/device_info/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from packages/device_info/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to packages/device_info/device_info/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary files differ
diff --git a/packages/device_info/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/packages/device_info/device_info/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from packages/device_info/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to packages/device_info/device_info/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary files differ
diff --git a/packages/device_info/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/packages/device_info/device_info/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from packages/device_info/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to packages/device_info/device_info/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary files differ
diff --git a/packages/device_info/example/android/build.gradle b/packages/device_info/device_info/example/android/build.gradle
similarity index 100%
rename from packages/device_info/example/android/build.gradle
rename to packages/device_info/device_info/example/android/build.gradle
diff --git a/packages/device_info/example/android/gradle.properties b/packages/device_info/device_info/example/android/gradle.properties
similarity index 100%
rename from packages/device_info/example/android/gradle.properties
rename to packages/device_info/device_info/example/android/gradle.properties
diff --git a/packages/device_info/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/device_info/device_info/example/android/gradle/wrapper/gradle-wrapper.properties
similarity index 100%
rename from packages/device_info/example/android/gradle/wrapper/gradle-wrapper.properties
rename to packages/device_info/device_info/example/android/gradle/wrapper/gradle-wrapper.properties
diff --git a/packages/device_info/example/android/settings.gradle b/packages/device_info/device_info/example/android/settings.gradle
similarity index 100%
rename from packages/device_info/example/android/settings.gradle
rename to packages/device_info/device_info/example/android/settings.gradle
diff --git a/packages/device_info/example/ios/Flutter/AppFrameworkInfo.plist b/packages/device_info/device_info/example/ios/Flutter/AppFrameworkInfo.plist
similarity index 100%
rename from packages/device_info/example/ios/Flutter/AppFrameworkInfo.plist
rename to packages/device_info/device_info/example/ios/Flutter/AppFrameworkInfo.plist
diff --git a/packages/device_info/example/ios/Flutter/Debug.xcconfig b/packages/device_info/device_info/example/ios/Flutter/Debug.xcconfig
similarity index 100%
rename from packages/device_info/example/ios/Flutter/Debug.xcconfig
rename to packages/device_info/device_info/example/ios/Flutter/Debug.xcconfig
diff --git a/packages/device_info/example/ios/Flutter/Release.xcconfig b/packages/device_info/device_info/example/ios/Flutter/Release.xcconfig
similarity index 100%
rename from packages/device_info/example/ios/Flutter/Release.xcconfig
rename to packages/device_info/device_info/example/ios/Flutter/Release.xcconfig
diff --git a/packages/device_info/example/ios/Runner.xcodeproj/project.pbxproj b/packages/device_info/device_info/example/ios/Runner.xcodeproj/project.pbxproj
similarity index 100%
rename from packages/device_info/example/ios/Runner.xcodeproj/project.pbxproj
rename to packages/device_info/device_info/example/ios/Runner.xcodeproj/project.pbxproj
diff --git a/packages/device_info/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/packages/device_info/device_info/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from packages/device_info/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
rename to packages/device_info/device_info/example/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/packages/device_info/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/device_info/device_info/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
similarity index 100%
rename from packages/device_info/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
rename to packages/device_info/device_info/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
diff --git a/packages/device_info/example/ios/Runner.xcworkspace/contents.xcworkspacedata b/packages/device_info/device_info/example/ios/Runner.xcworkspace/contents.xcworkspacedata
similarity index 100%
rename from packages/device_info/example/ios/Runner.xcworkspace/contents.xcworkspacedata
rename to packages/device_info/device_info/example/ios/Runner.xcworkspace/contents.xcworkspacedata
diff --git a/packages/device_info/example/ios/Runner/AppDelegate.h b/packages/device_info/device_info/example/ios/Runner/AppDelegate.h
similarity index 100%
rename from packages/device_info/example/ios/Runner/AppDelegate.h
rename to packages/device_info/device_info/example/ios/Runner/AppDelegate.h
diff --git a/packages/device_info/example/ios/Runner/AppDelegate.m b/packages/device_info/device_info/example/ios/Runner/AppDelegate.m
similarity index 100%
rename from packages/device_info/example/ios/Runner/AppDelegate.m
rename to packages/device_info/device_info/example/ios/Runner/AppDelegate.m
diff --git a/packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
similarity index 100%
rename from packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
rename to packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
similarity index 100%
rename from packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
rename to packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
Binary files differ
diff --git a/packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
similarity index 100%
rename from packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
rename to packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
Binary files differ
diff --git a/packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
similarity index 100%
rename from packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
rename to packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
Binary files differ
diff --git a/packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
similarity index 100%
rename from packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
rename to packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
Binary files differ
diff --git a/packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
similarity index 100%
rename from packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
rename to packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
Binary files differ
diff --git a/packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
similarity index 100%
rename from packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
rename to packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
Binary files differ
diff --git a/packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
similarity index 100%
rename from packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
rename to packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
Binary files differ
diff --git a/packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
similarity index 100%
rename from packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
rename to packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
Binary files differ
diff --git a/packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
similarity index 100%
rename from packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
rename to packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
Binary files differ
diff --git a/packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
similarity index 100%
rename from packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
rename to packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
Binary files differ
diff --git a/packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
similarity index 100%
rename from packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
rename to packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
Binary files differ
diff --git a/packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
similarity index 100%
rename from packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
rename to packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
Binary files differ
diff --git a/packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
similarity index 100%
rename from packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
rename to packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
Binary files differ
diff --git a/packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
similarity index 100%
rename from packages/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
rename to packages/device_info/device_info/example/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
Binary files differ
diff --git a/packages/device_info/example/ios/Runner/Base.lproj/LaunchScreen.storyboard b/packages/device_info/device_info/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
similarity index 100%
rename from packages/device_info/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
rename to packages/device_info/device_info/example/ios/Runner/Base.lproj/LaunchScreen.storyboard
diff --git a/packages/device_info/example/ios/Runner/Base.lproj/Main.storyboard b/packages/device_info/device_info/example/ios/Runner/Base.lproj/Main.storyboard
similarity index 100%
rename from packages/device_info/example/ios/Runner/Base.lproj/Main.storyboard
rename to packages/device_info/device_info/example/ios/Runner/Base.lproj/Main.storyboard
diff --git a/packages/device_info/example/ios/Runner/Info.plist b/packages/device_info/device_info/example/ios/Runner/Info.plist
similarity index 100%
rename from packages/device_info/example/ios/Runner/Info.plist
rename to packages/device_info/device_info/example/ios/Runner/Info.plist
diff --git a/packages/device_info/example/ios/Runner/main.m b/packages/device_info/device_info/example/ios/Runner/main.m
similarity index 100%
rename from packages/device_info/example/ios/Runner/main.m
rename to packages/device_info/device_info/example/ios/Runner/main.m
diff --git a/packages/device_info/example/lib/main.dart b/packages/device_info/device_info/example/lib/main.dart
similarity index 100%
rename from packages/device_info/example/lib/main.dart
rename to packages/device_info/device_info/example/lib/main.dart
diff --git a/packages/device_info/example/pubspec.yaml b/packages/device_info/device_info/example/pubspec.yaml
similarity index 92%
rename from packages/device_info/example/pubspec.yaml
rename to packages/device_info/device_info/example/pubspec.yaml
index 0546cb6..f26ee03 100644
--- a/packages/device_info/example/pubspec.yaml
+++ b/packages/device_info/device_info/example/pubspec.yaml
@@ -11,7 +11,7 @@
flutter_driver:
sdk: flutter
e2e:
- path: ../../e2e
+ path: ../../../e2e
pedantic: ^1.8.0
flutter:
diff --git a/packages/device_info/example/test_driver/device_info_e2e.dart b/packages/device_info/device_info/example/test_driver/device_info_e2e.dart
similarity index 100%
rename from packages/device_info/example/test_driver/device_info_e2e.dart
rename to packages/device_info/device_info/example/test_driver/device_info_e2e.dart
diff --git a/packages/device_info/example/test_driver/device_info_e2e_test.dart b/packages/device_info/device_info/example/test_driver/device_info_e2e_test.dart
similarity index 100%
rename from packages/device_info/example/test_driver/device_info_e2e_test.dart
rename to packages/device_info/device_info/example/test_driver/device_info_e2e_test.dart
diff --git a/packages/device_info/ios/Assets/.gitkeep b/packages/device_info/device_info/ios/Assets/.gitkeep
similarity index 100%
rename from packages/device_info/ios/Assets/.gitkeep
rename to packages/device_info/device_info/ios/Assets/.gitkeep
diff --git a/packages/device_info/ios/Classes/FLTDeviceInfoPlugin.h b/packages/device_info/device_info/ios/Classes/FLTDeviceInfoPlugin.h
similarity index 100%
rename from packages/device_info/ios/Classes/FLTDeviceInfoPlugin.h
rename to packages/device_info/device_info/ios/Classes/FLTDeviceInfoPlugin.h
diff --git a/packages/device_info/ios/Classes/FLTDeviceInfoPlugin.m b/packages/device_info/device_info/ios/Classes/FLTDeviceInfoPlugin.m
similarity index 100%
rename from packages/device_info/ios/Classes/FLTDeviceInfoPlugin.m
rename to packages/device_info/device_info/ios/Classes/FLTDeviceInfoPlugin.m
diff --git a/packages/device_info/ios/device_info.podspec b/packages/device_info/device_info/ios/device_info.podspec
similarity index 100%
rename from packages/device_info/ios/device_info.podspec
rename to packages/device_info/device_info/ios/device_info.podspec
diff --git a/packages/device_info/lib/device_info.dart b/packages/device_info/device_info/lib/device_info.dart
similarity index 100%
rename from packages/device_info/lib/device_info.dart
rename to packages/device_info/device_info/lib/device_info.dart
diff --git a/packages/device_info/pubspec.yaml b/packages/device_info/device_info/pubspec.yaml
similarity index 97%
rename from packages/device_info/pubspec.yaml
rename to packages/device_info/device_info/pubspec.yaml
index f1883a7..8792bda 100644
--- a/packages/device_info/pubspec.yaml
+++ b/packages/device_info/device_info/pubspec.yaml
@@ -5,7 +5,7 @@
# 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
deleted file mode 100644
index 462b903..0000000
--- a/packages/device_info/device_info_android.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$/android">
- <sourceFolder url="file://$MODULE_DIR$/android/app/src/main/java" isTestSource="false" />
- </content>
- <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Flutter for Android" level="project" />
- </component>
-</module>
diff --git a/packages/device_info/example/android.iml b/packages/device_info/example/android.iml
deleted file mode 100644
index 462b903..0000000
--- a/packages/device_info/example/android.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$/android">
- <sourceFolder url="file://$MODULE_DIR$/android/app/src/main/java" isTestSource="false" />
- </content>
- <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Flutter for Android" level="project" />
- </component>
-</module>
diff --git a/packages/device_info/example/device_info_example.iml b/packages/device_info/example/device_info_example.iml
deleted file mode 100644
index 9d5dae1..0000000
--- a/packages/device_info/example/device_info_example.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="FLUTTER_MODULE_TYPE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <excludeFolder url="file://$MODULE_DIR$/.idea" />
- <excludeFolder url="file://$MODULE_DIR$/.pub" />
- <excludeFolder url="file://$MODULE_DIR$/build" />
- <excludeFolder url="file://$MODULE_DIR$/packages" />
- </content>
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Dart Packages" level="project" />
- <orderEntry type="library" name="Dart SDK" level="project" />
- </component>
-</module>
\ No newline at end of file
diff --git a/packages/device_info/example/device_info_example_android.iml b/packages/device_info/example/device_info_example_android.iml
deleted file mode 100644
index 462b903..0000000
--- a/packages/device_info/example/device_info_example_android.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$/android">
- <sourceFolder url="file://$MODULE_DIR$/android/app/src/main/java" isTestSource="false" />
- </content>
- <orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Flutter for Android" level="project" />
- </component>
-</module>
