flutter · stuartmorgan-g · Nov 10, 2021 · Nov 1, 2021 · Nov 1, 2021 · Nov 1, 2021
diff --git a/packages/path_provider/path_provider/CHANGELOG.md b/packages/path_provider/path_provider/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.7
+
+* Moved Android and iOS implementations to federated packages.
+
 ## 2.0.6
 
 * Added support for Background Platform Channels on Android when it is

diff --git a/packages/path_provider/path_provider/android/settings.gradle b/packages/path_provider/path_provider/android/settings.gradle
diff --git a/packages/path_provider/path_provider/pubspec.yaml b/packages/path_provider/path_provider/pubspec.yaml
@@ -2,7 +2,10 @@ name: path_provider
 description: Flutter plugin for getting commonly used locations on host platform file systems, such as the temp and app data directories.
 repository: https://github.com/flutter/plugins/tree/master/packages/path_provider/path_provider
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+path_provider%22
-version: 2.0.6
+version: 2.0.7
+# Temporarily disable publishing to allow moving Android and iOS
+# implementations.
+publish_to: none
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
@@ -12,10 +15,9 @@ flutter:
   plugin:
     platforms:
       android:
-        package: io.flutter.plugins.pathprovider
-        pluginClass: PathProviderPlugin
+        default_package: path_provider_android
       ios:
-        pluginClass: FLTPathProviderPlugin
+        default_package: path_provider_ios
       macos:
         default_package: path_provider_macos
       linux:
@@ -26,6 +28,11 @@ flutter:
 dependencies:
   flutter:
     sdk: flutter
+  # Temporary path dependencies to allow moving Android and iOS implementations.
+  path_provider_android:
+    path: ../path_provider_android
+  path_provider_ios:
+    path: ../path_provider_ios
   path_provider_linux: ^2.0.0
   path_provider_macos: ^2.0.0
   path_provider_platform_interface: ^2.0.0

diff --git a/packages/path_provider/path_provider_android/AUTHORS b/packages/path_provider/path_provider_android/AUTHORS
@@ -0,0 +1,66 @@
+# Below is a list of people and organizations that have contributed
+# to the Flutter project. Names should be added to the list like so:
+#
+#   Name/Organization <email address>
+
+Google Inc.
+The Chromium Authors
+German Saprykin <[email protected]>
+Benjamin Sauer <[email protected]>
+[email protected]
+Ali Bitek <[email protected]>
+Pol Batlló <[email protected]>
+Anatoly Pulyaevskiy
+Hayden Flinner <[email protected]>
+Stefano Rodriguez <[email protected]>
+Salvatore Giordano <[email protected]>
+Brian Armstrong <[email protected]>
+Paul DeMarco <[email protected]>
+Fabricio Nogueira <[email protected]>
+Simon Lightfoot <[email protected]>
+Ashton Thomas <[email protected]>
+Thomas Danner <[email protected]>
+Diego Velásquez <[email protected]>
+Hajime Nakamura <[email protected]>
+Tuyển Vũ Xuân <[email protected]>
+Miguel Ruivo <[email protected]>
+Sarthak Verma <[email protected]>
+Mike Diarmid <[email protected]>
+Invertase <[email protected]>
+Elliot Hesp <[email protected]>
+Vince Varga <[email protected]>
+Aawaz Gyawali <[email protected]>
+EUI Limited <[email protected]>
+Katarina Sheremet <[email protected]>
+Thomas Stockx <[email protected]>
+Sarbagya Dhaubanjar <[email protected]>
+Ozkan Eksi <[email protected]>
+Rishab Nayak <[email protected]>
+ko2ic <[email protected]>
+Jonathan Younger <[email protected]>
+Jose Sanchez <[email protected]>
+Debkanchan Samadder <[email protected]>
+Audrius Karosevicius <[email protected]>
+Lukasz Piliszczuk <[email protected]>
+SoundReply Solutions GmbH <[email protected]>
+Rafal Wachol <[email protected]>
+Pau Picas <[email protected]>
+Christian Weder <[email protected]>
+Alexandru Tuca <[email protected]>
+Christian Weder <[email protected]>
+Rhodes Davis Jr. <[email protected]>
+Luigi Agosti <[email protected]>
+Quentin Le Guennec <[email protected]>
+Koushik Ravikumar <[email protected]>
+Nissim Dsilva <[email protected]>
+Giancarlo Rocha <[email protected]>
+Ryo Miyake <[email protected]>
+Théo Champion <[email protected]>
+Kazuki Yamaguchi <[email protected]>
+Eitan Schwartz <[email protected]>
+Chris Rutkowski <[email protected]>
+Juan Alvarez <[email protected]>
+Aleksandr Yurkovskiy <[email protected]>
+Anton Borries <[email protected]>
+Alex Li <[email protected]>
+Rahul Raj <[email protected]>
diff --git a/packages/path_provider/path_provider_android/CHANGELOG.md b/packages/path_provider/path_provider_android/CHANGELOG.md
@@ -0,0 +1,3 @@
+## 2.0.6
+
+* Split from `path_provider` as a federated implementation.
diff --git a/packages/path_provider/path_provider_android/LICENSE b/packages/path_provider/path_provider_android/LICENSE
@@ -0,0 +1,25 @@
+Copyright 2013 The Flutter Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+    * Neither the name of Google Inc. nor the names of its
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/packages/path_provider/path_provider_android/README.md b/packages/path_provider/path_provider_android/README.md
@@ -0,0 +1,11 @@
+# path\_provider\_android
+
+The Android implementation of [`path_provider`].
+
+## Usage
+
+This package is [endorsed][2], which means you can simply use `path_provider`
+normally. This package will be automatically included in your app when you do.
+
+[1]: https://pub.dev/packages/path_provider
+[2]: https://flutter.dev/docs/development/packages-and-plugins/developing-packages#endorsed-federated-plugin
diff --git a/...ovider/path_provider/android/build.gradle → ...ath_provider_android/android/build.gradle b/...ovider/path_provider/android/build.gradle → ...ath_provider_android/android/build.gradle
diff --git a/packages/path_provider/path_provider_android/android/settings.gradle b/packages/path_provider/path_provider_android/android/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'path_provider_android'
diff --git a/...ider/android/src/main/AndroidManifest.xml → ...roid/android/src/main/AndroidManifest.xml b/...ider/android/src/main/AndroidManifest.xml → ...roid/android/src/main/AndroidManifest.xml
diff --git a/...gins/pathprovider/PathProviderPlugin.java → ...gins/pathprovider/PathProviderPlugin.java b/...gins/pathprovider/PathProviderPlugin.java → ...gins/pathprovider/PathProviderPlugin.java
diff --git a/.../pathprovider/StorageDirectoryMapper.java → .../pathprovider/StorageDirectoryMapper.java b/.../pathprovider/StorageDirectoryMapper.java → .../pathprovider/StorageDirectoryMapper.java
diff --git a/...hprovider/StorageDirectoryMapperTest.java → ...hprovider/StorageDirectoryMapperTest.java b/...hprovider/StorageDirectoryMapperTest.java → ...hprovider/StorageDirectoryMapperTest.java
diff --git a/packages/path_provider/path_provider_android/example/README.md b/packages/path_provider/path_provider_android/example/README.md
@@ -0,0 +1,8 @@
+# path_provider_example
+
+Demonstrates how to use the path_provider plugin.
+
+## Getting Started
+
+For help getting started with Flutter, view our online
+[documentation](https://flutter.dev/).
diff --git a/packages/path_provider/path_provider_android/example/android/app/build.gradle b/packages/path_provider/path_provider_android/example/android/app/build.gradle
@@ -0,0 +1,64 @@
+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 from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+
+android {
+    compileSdkVersion 29
+
+    lintOptions {
+        disable 'InvalidPackage'
+    }
+
+    defaultConfig {
+        applicationId "io.flutter.plugins.pathproviderexample"
+        minSdkVersion 16
+        targetSdkVersion 28
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    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 {
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test:rules:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
+}
diff --git a/...ovider/path_provider_android/example/android/app/gradle/wrapper/gradle-wrapper.properties b/...ovider/path_provider_android/example/android/app/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/...roid/example/android/app/src/androidTest/java/io/flutter/plugins/DartIntegrationTest.java b/...roid/example/android/app/src/androidTest/java/io/flutter/plugins/DartIntegrationTest.java
@@ -0,0 +1,14 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface DartIntegrationTest {}
diff --git a/...le/android/app/src/androidTest/java/io/flutter/plugins/pathprovider/MainActivityTest.java b/...le/android/app/src/androidTest/java/io/flutter/plugins/pathprovider/MainActivityTest.java
@@ -0,0 +1,19 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+package io.flutter.plugins.pathprovider;
+
+import androidx.test.rule.ActivityTestRule;
+import dev.flutter.plugins.integration_test.FlutterTestRunner;
+import io.flutter.embedding.android.FlutterActivity;
+import io.flutter.plugins.DartIntegrationTest;
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+
+@DartIntegrationTest
+@RunWith(FlutterTestRunner.class)
+public class MainActivityTest {
+  @Rule
+  public ActivityTestRule<FlutterActivity> rule = new ActivityTestRule<>(FlutterActivity.class);
+}
diff --git a/...ages/path_provider/path_provider_android/example/android/app/src/main/AndroidManifest.xml b/...ages/path_provider/path_provider_android/example/android/app/src/main/AndroidManifest.xml
@@ -0,0 +1,20 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="io.flutter.plugins.pathproviderexample">
+
+    <uses-permission android:name="android.permission.INTERNET"/>
+
+    <application android:label="path_provider_example" android:icon="@mipmap/ic_launcher">
+        <activity android:name="io.flutter.embedding.android.FlutterActivity"
+                  android:launchMode="singleTop"
+                  android:theme="@android:style/Theme.Black.NoTitleBar"
+                  android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection"
+                  android:hardwareAccelerated="true"
+                  android:windowSoftInputMode="adjustResize">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+        <meta-data android:name="flutterEmbedding" android:value="2"/>
+    </application>
+</manifest>
diff --git a/...h_provider_android/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/...h_provider_android/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/...h_provider_android/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/...h_provider_android/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/..._provider_android/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/..._provider_android/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/...provider_android/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/...provider_android/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/...rovider_android/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/...rovider_android/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/packages/path_provider/path_provider_android/example/android/build.gradle b/packages/path_provider/path_provider_android/example/android/build.gradle
@@ -0,0 +1,29 @@
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.3.0'
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+rootProject.buildDir = '../build'
+subprojects {
+    project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
+    project.evaluationDependsOn(':app')
+}
+
+task clean(type: Delete) {
+    delete rootProject.buildDir
+}
diff --git a/packages/path_provider/path_provider_android/example/android/gradle.properties b/packages/path_provider/path_provider_android/example/android/gradle.properties
@@ -0,0 +1,4 @@
+org.gradle.jvmargs=-Xmx1536M
+android.enableR8=true
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/...h_provider/path_provider_android/example/android/gradle/wrapper/gradle-wrapper.properties b/...h_provider/path_provider_android/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/packages/path_provider/path_provider_android/example/android/settings.gradle b/packages/path_provider/path_provider_android/example/android/settings.gradle
@@ -0,0 +1,15 @@
+include ':app'
+
+def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
+
+def plugins = new Properties()
+def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
+if (pluginsFile.exists()) {
+    pluginsFile.withInputStream { stream -> plugins.load(stream) }
+}
+
+plugins.each { name, path ->
+    def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
+    include ":$name"
+    project(":$name").projectDir = pluginDirectory
+}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		## 2.0.6

		* Split from `path_provider` as a federated implementation.