flutter · ditman · Aug 27, 2020 · Aug 26, 2020 · Aug 27, 2020
diff --git a/packages/battery/CHANGELOG.md → packages/battery/battery/CHANGELOG.md b/packages/battery/CHANGELOG.md → packages/battery/battery/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.4+1
+
+* Moved everything from battery to battery/battery
+
 ## 1.0.4
 
 * Updated README.md.

diff --git a/packages/battery/LICENSE → packages/battery/battery/LICENSE b/packages/battery/LICENSE → packages/battery/battery/LICENSE
diff --git a/packages/battery/README.md → packages/battery/battery/README.md b/packages/battery/README.md → packages/battery/battery/README.md
diff --git a/packages/battery/android/build.gradle → ...ages/battery/battery/android/build.gradle b/packages/battery/android/build.gradle → ...ages/battery/battery/android/build.gradle
diff --git a/packages/battery/android/gradle.properties → ...battery/battery/android/gradle.properties b/packages/battery/android/gradle.properties → ...battery/battery/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/packages/battery/android/settings.gradle → ...s/battery/battery/android/settings.gradle b/packages/battery/android/settings.gradle → ...s/battery/battery/android/settings.gradle
diff --git a/...tery/android/src/main/AndroidManifest.xml → ...tery/android/src/main/AndroidManifest.xml b/...tery/android/src/main/AndroidManifest.xml → ...tery/android/src/main/AndroidManifest.xml
diff --git a/...lutter/plugins/battery/BatteryPlugin.java → ...lutter/plugins/battery/BatteryPlugin.java b/...lutter/plugins/battery/BatteryPlugin.java → ...lutter/plugins/battery/BatteryPlugin.java
diff --git a/packages/battery/example/README.md → packages/battery/battery/example/README.md b/packages/battery/example/README.md → packages/battery/battery/example/README.md
diff --git a/.../battery/example/android/app/build.gradle → .../battery/example/android/app/build.gradle b/.../battery/example/android/app/build.gradle → .../battery/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/...ugins/battery/EmbedderV1ActivityTest.java → ...ugins/battery/EmbedderV1ActivityTest.java b/...ugins/battery/EmbedderV1ActivityTest.java → ...ugins/battery/EmbedderV1ActivityTest.java
diff --git a/.../plugins/battery/FlutterActivityTest.java → .../plugins/battery/FlutterActivityTest.java b/.../plugins/battery/FlutterActivityTest.java → .../plugins/battery/FlutterActivityTest.java
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/...ns/batteryexample/EmbedderV1Activity.java → ...ns/batteryexample/EmbedderV1Activity.java b/...ns/batteryexample/EmbedderV1Activity.java → ...ns/batteryexample/EmbedderV1Activity.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/...ages/battery/example/android/build.gradle → ...tery/battery/example/android/build.gradle b/...ages/battery/example/android/build.gradle → ...tery/battery/example/android/build.gradle
diff --git a/...battery/example/android/gradle.properties → ...battery/example/android/gradle.properties b/...battery/example/android/gradle.properties → ...battery/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/...s/battery/example/android/settings.gradle → ...y/battery/example/android/settings.gradle b/...s/battery/example/android/settings.gradle → ...y/battery/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/...attery/example/ios/Flutter/Debug.xcconfig → ...attery/example/ios/Flutter/Debug.xcconfig b/...attery/example/ios/Flutter/Debug.xcconfig → ...attery/example/ios/Flutter/Debug.xcconfig
diff --git a/...tery/example/ios/Flutter/Release.xcconfig → ...tery/example/ios/Flutter/Release.xcconfig b/...tery/example/ios/Flutter/Release.xcconfig → ...tery/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/.../battery/example/ios/Runner/AppDelegate.h → .../battery/example/ios/Runner/AppDelegate.h b/.../battery/example/ios/Runner/AppDelegate.h → .../battery/example/ios/Runner/AppDelegate.h
diff --git a/.../battery/example/ios/Runner/AppDelegate.m → .../battery/example/ios/Runner/AppDelegate.m b/.../battery/example/ios/Runner/AppDelegate.m → .../battery/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/Icon-App-20x20@1x.png → .../AppIcon.appiconset/Icon-App-20x20@1x.png b/.../AppIcon.appiconset/Icon-App-20x20@1x.png → .../AppIcon.appiconset/Icon-App-20x20@1x.png
diff --git a/.../AppIcon.appiconset/Icon-App-20x20@2x.png → .../AppIcon.appiconset/Icon-App-20x20@2x.png b/.../AppIcon.appiconset/Icon-App-20x20@2x.png → .../AppIcon.appiconset/Icon-App-20x20@2x.png
diff --git a/.../AppIcon.appiconset/Icon-App-20x20@3x.png → .../AppIcon.appiconset/Icon-App-20x20@3x.png b/.../AppIcon.appiconset/Icon-App-20x20@3x.png → .../AppIcon.appiconset/Icon-App-20x20@3x.png
diff --git a/.../AppIcon.appiconset/Icon-App-29x29@1x.png → .../AppIcon.appiconset/Icon-App-29x29@1x.png b/.../AppIcon.appiconset/Icon-App-29x29@1x.png → .../AppIcon.appiconset/Icon-App-29x29@1x.png
diff --git a/.../AppIcon.appiconset/Icon-App-29x29@2x.png → .../AppIcon.appiconset/Icon-App-29x29@2x.png b/.../AppIcon.appiconset/Icon-App-29x29@2x.png → .../AppIcon.appiconset/Icon-App-29x29@2x.png
diff --git a/.../AppIcon.appiconset/Icon-App-29x29@3x.png → .../AppIcon.appiconset/Icon-App-29x29@3x.png b/.../AppIcon.appiconset/Icon-App-29x29@3x.png → .../AppIcon.appiconset/Icon-App-29x29@3x.png
diff --git a/.../AppIcon.appiconset/Icon-App-40x40@1x.png → .../AppIcon.appiconset/Icon-App-40x40@1x.png b/.../AppIcon.appiconset/Icon-App-40x40@1x.png → .../AppIcon.appiconset/Icon-App-40x40@1x.png
diff --git a/.../AppIcon.appiconset/Icon-App-40x40@2x.png → .../AppIcon.appiconset/Icon-App-40x40@2x.png b/.../AppIcon.appiconset/Icon-App-40x40@2x.png → .../AppIcon.appiconset/Icon-App-40x40@2x.png
diff --git a/.../AppIcon.appiconset/Icon-App-40x40@3x.png → .../AppIcon.appiconset/Icon-App-40x40@3x.png b/.../AppIcon.appiconset/Icon-App-40x40@3x.png → .../AppIcon.appiconset/Icon-App-40x40@3x.png
diff --git a/.../AppIcon.appiconset/Icon-App-60x60@2x.png → .../AppIcon.appiconset/Icon-App-60x60@2x.png b/.../AppIcon.appiconset/Icon-App-60x60@2x.png → .../AppIcon.appiconset/Icon-App-60x60@2x.png
diff --git a/.../AppIcon.appiconset/Icon-App-60x60@3x.png → .../AppIcon.appiconset/Icon-App-60x60@3x.png b/.../AppIcon.appiconset/Icon-App-60x60@3x.png → .../AppIcon.appiconset/Icon-App-60x60@3x.png
diff --git a/.../AppIcon.appiconset/Icon-App-76x76@1x.png → .../AppIcon.appiconset/Icon-App-76x76@1x.png b/.../AppIcon.appiconset/Icon-App-76x76@1x.png → .../AppIcon.appiconset/Icon-App-76x76@1x.png
diff --git a/.../AppIcon.appiconset/Icon-App-76x76@2x.png → .../AppIcon.appiconset/Icon-App-76x76@2x.png b/.../AppIcon.appiconset/Icon-App-76x76@2x.png → .../AppIcon.appiconset/Icon-App-76x76@2x.png
diff --git a/...Icon.appiconset/Icon-App-83.5x83.5@2x.png → ...Icon.appiconset/Icon-App-83.5x83.5@2x.png b/...Icon.appiconset/Icon-App-83.5x83.5@2x.png → ...Icon.appiconset/Icon-App-83.5x83.5@2x.png
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/...ges/battery/example/ios/Runner/Info.plist → ...ery/battery/example/ios/Runner/Info.plist b/...ges/battery/example/ios/Runner/Info.plist → ...ery/battery/example/ios/Runner/Info.plist
diff --git a/packages/battery/example/ios/Runner/main.m → ...battery/battery/example/ios/Runner/main.m b/packages/battery/example/ios/Runner/main.m → ...battery/battery/example/ios/Runner/main.m
diff --git a/packages/battery/example/lib/main.dart → ...ges/battery/battery/example/lib/main.dart b/packages/battery/example/lib/main.dart → ...ges/battery/battery/example/lib/main.dart
diff --git a/packages/battery/example/pubspec.yaml → ...ages/battery/battery/example/pubspec.yaml b/packages/battery/example/pubspec.yaml → ...ages/battery/battery/example/pubspec.yaml
@@ -11,7 +11,7 @@ dev_dependencies:
   flutter_driver:
     sdk: flutter
   integration_test:
-    path: ../../integration_test
+    path: ../../../integration_test
   pedantic: ^1.8.0
 
 flutter:

diff --git a/packages/battery/ios/Assets/.gitkeep → packages/battery/battery/ios/Assets/.gitkeep b/packages/battery/ios/Assets/.gitkeep → packages/battery/battery/ios/Assets/.gitkeep
diff --git a/...es/battery/ios/Classes/FLTBatteryPlugin.h → ...ry/battery/ios/Classes/FLTBatteryPlugin.h b/...es/battery/ios/Classes/FLTBatteryPlugin.h → ...ry/battery/ios/Classes/FLTBatteryPlugin.h
diff --git a/...es/battery/ios/Classes/FLTBatteryPlugin.m → ...ry/battery/ios/Classes/FLTBatteryPlugin.m b/...es/battery/ios/Classes/FLTBatteryPlugin.m → ...ry/battery/ios/Classes/FLTBatteryPlugin.m
diff --git a/packages/battery/ios/battery.podspec → packages/battery/battery/ios/battery.podspec b/packages/battery/ios/battery.podspec → packages/battery/battery/ios/battery.podspec
diff --git a/packages/battery/lib/battery.dart → packages/battery/battery/lib/battery.dart b/packages/battery/lib/battery.dart → packages/battery/battery/lib/battery.dart
diff --git a/packages/battery/pubspec.yaml → packages/battery/battery/pubspec.yaml b/packages/battery/pubspec.yaml → packages/battery/battery/pubspec.yaml
@@ -1,8 +1,8 @@
 name: battery
 description: Flutter plugin for accessing information about the battery state
   (full, charging, discharging) on Android and iOS.
-homepage: https://github.com/flutter/plugins/tree/master/packages/battery
-version: 1.0.4
+homepage: https://github.com/flutter/plugins/tree/master/packages/battery/battery
+version: 1.0.4+1
 
 flutter:
   plugin:
@@ -25,7 +25,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   integration_test:
-    path: ../integration_test
+    path: ../../integration_test
   pedantic: ^1.8.0
 
 environment:

diff --git a/packages/battery/test/battery_e2e.dart → ...ges/battery/battery/test/battery_e2e.dart b/packages/battery/test/battery_e2e.dart → ...ges/battery/battery/test/battery_e2e.dart
diff --git a/packages/battery/test/battery_test.dart → ...es/battery/battery/test/battery_test.dart b/packages/battery/test/battery_test.dart → ...es/battery/battery/test/battery_test.dart
diff --git a/packages/battery/example/android.iml b/packages/battery/example/android.iml
diff --git a/packages/battery/example/battery_example.iml b/packages/battery/example/battery_example.iml