Fix Android and iOS feature builds (#32)

* Download python dists from jobs for non-release builds

* copyBuildDist task

* Enable all CI jobs

* Cleanup

* Re-enable pubspec.lock in apps

* Deps updated

Author: FeodorFitsner

.appveyor.yml

@@ -152,9 +152,9 @@ for:
       - popd
 
       # package all .so files
-      - DIST_FILE_NAME=python-android-dist-v$APPVEYOR_BUILD_VERSION.zip
+      - DIST_FILE_NAME=python-android-dist-v$APPVEYOR_BUILD_VERSION.tar.gz
       - pushd ~/.local/share/python-for-android/dists/serious_python/libs
-      - zip -r $DIST_FILE_NAME .
+      - tar -czvf $DIST_FILE_NAME *
       - appveyor PushArtifact $DIST_FILE_NAME -DeploymentName python-dist-android
       - popd
 
@@ -184,6 +184,13 @@ for:
       - flutter config --enable-macos-desktop
       - flutter doctor
 
+      # download dist for non-releases
+      - |
+          if [[ "$APPVEYOR_REPO_TAG_NAME" == "" ]]; then
+            python3 ci/download_artifact.py "Build Python for iOS" "python-ios-dist-v{version}.tar.gz"
+            export SERIOUS_PYTHON_IOS_DIST=$APPVEYOR_BUILD_FOLDER/python_dist/dist
+          fi
+
     build: off
 
     test_script:
@@ -216,6 +223,13 @@ for:
           xcrun simctl boot "${UDID:?No Simulator with this name found}"
       - flutter doctor -v
 
+      # download dist for non-releases
+      - |
+          if [[ "$APPVEYOR_REPO_TAG_NAME" == "" ]]; then
+            python3 ci/download_artifact.py "Build Python for iOS" "python-ios-dist-v{version}.tar.gz"
+            export SERIOUS_PYTHON_IOS_DIST=$APPVEYOR_BUILD_FOLDER/python_dist/dist
+          fi
+
     build: off
 
     test_script:
@@ -251,6 +265,13 @@ for:
       - flutter upgrade --force
       - flutter doctor -v
 
+      # download dist for non-releases
+      - |
+          if [[ "$APPVEYOR_REPO_TAG_NAME" == "" ]]; then
+            python3 ci/download_artifact.py "Build Python for Android" "python-android-dist-v{version}.tar.gz"
+            export SERIOUS_PYTHON_BUILD_DIST=$APPVEYOR_BUILD_FOLDER/python_dist
+          fi
+
     build: off
 
     test_script:

.gitignore

@@ -23,13 +23,15 @@ migrate_working_dir/
 
 # Flutter/Dart/Pub related
 # Libraries should not include pubspec.lock, per https://dart.dev/guides/libraries/private-files#pubspeclock.
-/pubspec.lock
+pubspec.lock
 **/doc/api/
 .dart_tool/
 .packages
 build/
 dist/
 .cache
+.flutter-plugins
+.flutter-plugins-dependencies
 
 # Python
 .venv/

ci/download_artifact.py

@@ -0,0 +1,51 @@
+import json
+import os
+import pathlib
+import sys
+import tarfile
+import urllib.request
+
+if len(sys.argv) < 2:
+    print("Specify artifact job name and artifact deployment name to download")
+    sys.exit(1)
+
+artifact_job_name = sys.argv[1]
+artifact_file_name = sys.argv[2].format(
+    version=os.environ.get("APPVEYOR_BUILD_VERSION")
+)
+
+build_jobs = {}
+
+
+def download_job_artifact(job_id, file_name, dest_file):
+    url = f"https://ci.appveyor.com/api/buildjobs/{job_id}/artifacts/{file_name}"
+    print(f"Downloading {url}...")
+    urllib.request.urlretrieve(url, dest_file)
+
+
+def get_build_job_ids():
+    account_name = os.environ.get("APPVEYOR_ACCOUNT_NAME")
+    project_slug = os.environ.get("APPVEYOR_PROJECT_SLUG")
+    build_id = os.environ.get("APPVEYOR_BUILD_ID")
+    url = f"https://ci.appveyor.com/api/projects/{account_name}/{project_slug}/builds/{build_id}"
+    print(f"Fetching build details at {url}")
+    req = urllib.request.Request(url)
+    req.add_header("Content-type", "application/json")
+    project = json.loads(urllib.request.urlopen(req).read().decode())
+    for job in project["build"]["jobs"]:
+        build_jobs[job["name"]] = job["jobId"]
+
+
+current_dir = pathlib.Path(os.getcwd())
+print("current_dir", current_dir)
+
+get_build_job_ids()
+
+# create "web" directory
+dist_path = current_dir.joinpath("python_dist")
+dist_path.mkdir(exist_ok=True)
+tar_path = current_dir.joinpath(artifact_file_name)
+download_job_artifact(build_jobs[artifact_job_name], artifact_file_name, tar_path)
+with tarfile.open(tar_path, "r:gz") as tar:
+    tar.extractall(str(dist_path))
+os.remove(tar_path)

src/serious_python/.gitignore

@@ -0,0 +1,7 @@
+# Dart
+!pubspec.lock
+
+# Python
+.venv/
+__pypackages__/
+*.zip

src/serious_python/example/.gitignore

@@ -5,10 +5,12 @@
 import FlutterMacOS
 import Foundation
 
+import package_info_plus
 import path_provider_foundation
 import serious_python_darwin
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SeriousPythonPlugin.register(with: registry.registrar(forPlugin: "SeriousPythonPlugin"))
 }

src/serious_python/example/flask_example/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -123,6 +123,11 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_web_plugins:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   http:
     dependency: "direct main"
     description:
@@ -179,6 +184,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.9.1"
+  package_info_plus:
+    dependency: transitive
+    description:
+      name: package_info_plus
+      sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.2.0"
+  package_info_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: package_info_plus_platform_interface
+      sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   path:
     dependency: transitive
     description:

src/serious_python/example/flask_example/pubspec.lock

@@ -5,10 +5,12 @@
 import FlutterMacOS
 import Foundation
 
+import package_info_plus
 import path_provider_foundation
 import serious_python_darwin
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
+  FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SeriousPythonPlugin.register(with: registry.registrar(forPlugin: "SeriousPythonPlugin"))
 }

src/serious_python/example/run_example/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -128,6 +128,11 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_web_plugins:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   fuchsia_remote_debug_protocol:
     dependency: transitive
     description: flutter
@@ -194,6 +199,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.9.1"
+  package_info_plus:
+    dependency: transitive
+    description:
+      name: package_info_plus
+      sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.2.0"
+  package_info_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: package_info_plus_platform_interface
+      sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   path:
     dependency: "direct main"
     description: