Release flutter_distributor v0.1.3

leanflutter · Jan 9, 2022 · 6d13770 · 6d13770
1 parent 6572423
commit 6d13770
Show file tree

Hide file tree

Showing 41 changed files with 164 additions and 131 deletions.
diff --git a/README-ZH.md b/README-ZH.md
@@ -62,19 +62,21 @@ releases:
           platform: android
           target: apk
           build_args:
-            target: lib/main.dart
             flavor: dev
             target-platform: android-arm,android-arm64
+            dart-define:
+              APP_ENV: dev
         publish_to: pgyer
       # 构建并发布您的 ipa 包到 pgyer
       - name: release-dev-ios
         package:
           platform: ios
           target: ipa
           build_args:
-            target: lib/main.dart
             flavor: dev
             export-options-plist: ios/dev_ExportOptions.plist
+            dart-define:
+              APP_ENV: dev
         publish_to: pgyer
 ```
 

diff --git a/README.md b/README.md
@@ -62,19 +62,21 @@ releases:
           platform: android
           target: apk
           build_args:
-            target: lib/main.dart
             flavor: dev
             target-platform: android-arm,android-arm64
+            dart-define:
+              APP_ENV: dev
         publish_to: pgyer
       # Build and publish your ipa pkg to pgyer
       - name: release-dev-ios
         package:
           platform: ios
           target: ipa
           build_args:
-            target: lib/main.dart
             flavor: dev
             export-options-plist: ios/dev_ExportOptions.plist
+            dart-define:
+              APP_ENV: dev
         publish_to: pgyer
 ```
 

diff --git a/examples/hello_world/pubspec.lock b/examples/hello_world/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.8.1"
+    version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -21,7 +21,7 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   charcode:
     dependency: transitive
     description:
@@ -87,7 +87,7 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.11"
   meta:
     dependency: transitive
     description:
@@ -148,7 +148,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.2"
+    version: "0.4.3"
   typed_data:
     dependency: transitive
     description:
@@ -162,6 +162,6 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.14.0 <3.0.0"
diff --git a/packages/app_package_maker/lib/src/app_package_maker.dart b/packages/app_package_maker/lib/src/app_package_maker.dart
@@ -30,30 +30,9 @@ abstract class AppPackageMaker {
     Directory appDirectory, {
     required Directory outputDirectory,
     String? flavor,
+    void Function(List<int> data)? onProcessStdOut,
+    void Function(List<int> data)? onProcessStdErr,
   });
-
-  Future<void> exec(
-    String executable,
-    List<String> arguments, {
-    bool runInShell = false,
-  }) async {
-    Process process = await Process.start(
-      executable,
-      arguments,
-      runInShell: runInShell,
-    );
-    process.stdout.listen((event) {
-      String log = utf8.decoder.convert(event).trim();
-      print(log);
-    });
-    process.stderr.listen((event) {
-      String log = utf8.decoder.convert(event).trim();
-      print(log);
-    });
-
-    int exitCode = await process.exitCode;
-    print('exitCode: $exitCode');
-  }
 }
 
 class MakeConfig {

diff --git a/packages/app_package_maker/pubspec.yaml b/packages/app_package_maker/pubspec.yaml
@@ -1,6 +1,6 @@
 name: app_package_maker
 description: App package maker
-version: 0.1.0
+version: 0.1.3
 homepage: https://github.com/leanflutter/flutter_distributor
 
 environment:

diff --git a/packages/app_package_maker_aab/lib/src/app_package_maker_aab.dart b/packages/app_package_maker_aab/lib/src/app_package_maker_aab.dart
@@ -12,6 +12,8 @@ class AppPackageMakerAab extends AppPackageMaker {
     Directory appDirectory, {
     required Directory outputDirectory,
     String? flavor,
+    void Function(List<int> data)? onProcessStdOut,
+    void Function(List<int> data)? onProcessStdErr,
   }) async {
     MakeConfig makeConfig = await loadMakeConfig()
       ..flavor = flavor

diff --git a/packages/app_package_maker_aab/pubspec.lock b/packages/app_package_maker_aab/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       path: "../app_package_maker"
       relative: true
     source: path
-    version: "0.1.0"
+    version: "0.1.3"
   charcode:
     dependency: transitive
     description:

diff --git a/packages/app_package_maker_aab/pubspec.yaml b/packages/app_package_maker_aab/pubspec.yaml
@@ -1,13 +1,13 @@
 name: app_package_maker_aab
 description: Create a aab package for your app.
-version: 0.1.0
+version: 0.1.3
 homepage: https://github.com/leanflutter/flutter_distributor
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
-  app_package_maker: ^0.1.0
+  app_package_maker: ^0.1.3
 
 # dependency_overrides:
 #   app_package_maker:

diff --git a/packages/app_package_maker_apk/lib/src/app_package_maker_apk.dart b/packages/app_package_maker_apk/lib/src/app_package_maker_apk.dart
@@ -19,6 +19,8 @@ class AppPackageMakerApk extends AppPackageMaker {
     Directory appDirectory, {
     required Directory outputDirectory,
     String? flavor,
+    void Function(List<int> data)? onProcessStdOut,
+    void Function(List<int> data)? onProcessStdErr,
   }) async {
     MakeConfig makeConfig = await loadMakeConfig()
       ..flavor = flavor

diff --git a/packages/app_package_maker_apk/pubspec.lock b/packages/app_package_maker_apk/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       path: "../app_package_maker"
       relative: true
     source: path
-    version: "0.1.0"
+    version: "0.1.3"
   charcode:
     dependency: transitive
     description:

diff --git a/packages/app_package_maker_apk/pubspec.yaml b/packages/app_package_maker_apk/pubspec.yaml
@@ -1,13 +1,13 @@
 name: app_package_maker_apk
 description: Create a apk package for your app.
-version: 0.1.0
+version: 0.1.3
 homepage: https://github.com/leanflutter/flutter_distributor
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
-  app_package_maker: ^0.1.0
+  app_package_maker: ^0.1.3
 
 # dependency_overrides:
 #   app_package_maker:

diff --git a/packages/app_package_maker_deb/lib/src/app_package_maker_deb.dart b/packages/app_package_maker_deb/lib/src/app_package_maker_deb.dart
@@ -14,6 +14,8 @@ class AppPackageMakerDeb extends AppPackageMaker {
     Directory appDirectory, {
     required Directory outputDirectory,
     String? flavor,
+    void Function(List<int> data)? onProcessStdOut,
+    void Function(List<int> data)? onProcessStdErr,
   }) async {
     MakeConfig makeConfig = await loadMakeConfig()
       ..outputDirectory = outputDirectory;
@@ -33,11 +35,20 @@ class AppPackageMakerDeb extends AppPackageMaker {
       '${appDirectory.path}/.',
       '${packagingDirectory.path}/usr/lib/${makeConfig.appName}/',
     ]);
-    Process.runSync('dpkg-deb', [
+
+    Process process = await Process.start('dpkg-deb', [
       '--build',
       '--root-owner-group',
       '${packagingDirectory.path}',
     ]);
+    process.stdout.listen(onProcessStdOut);
+    process.stderr.listen(onProcessStdErr);
+
+    int exitCode = await process.exitCode;
+    if (exitCode != 0) {
+      throw MakeError();
+    }
+
     packagingDirectory.deleteSync(recursive: true);
     return MakeResult(makeConfig);
   }

diff --git a/packages/app_package_maker_deb/pubspec.lock b/packages/app_package_maker_deb/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       path: "../app_package_maker"
       relative: true
     source: path
-    version: "0.1.0"
+    version: "0.1.3"
   charcode:
     dependency: transitive
     description:

diff --git a/packages/app_package_maker_deb/pubspec.yaml b/packages/app_package_maker_deb/pubspec.yaml
@@ -1,13 +1,13 @@
 name: app_package_maker_deb
 description: Create a deb package for your app.
-version: 0.1.0
+version: 0.1.3
 homepage: https://github.com/leanflutter/flutter_distributor
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
-  app_package_maker: ^0.1.0
+  app_package_maker: ^0.1.3
 
 # dependency_overrides:
 #   app_package_maker:

diff --git a/packages/app_package_maker_dmg/lib/src/app_package_maker_dmg.dart b/packages/app_package_maker_dmg/lib/src/app_package_maker_dmg.dart
@@ -25,6 +25,8 @@ class AppPackageMakerDmg extends AppPackageMaker {
     Directory appDirectory, {
     required Directory outputDirectory,
     String? flavor,
+    void Function(List<int> data)? onProcessStdOut,
+    void Function(List<int> data)? onProcessStdErr,
   }) async {
     MakeDmgConfig makeConfig = (await loadMakeConfig() as MakeDmgConfig)
       ..outputDirectory = outputDirectory;
@@ -36,17 +38,33 @@ class AppPackageMakerDmg extends AppPackageMaker {
         .map((e) => File(e.path))
         .first;
 
-    await exec('cp', ['-RH', appFile.path, packagingDirectory.path]);
-    await exec('cp', ['-RH', 'macos/packaging/dmg/.', packagingDirectory.path]);
+    Process process1 = await Process.start(
+        'cp', ['-RH', appFile.path, packagingDirectory.path]);
+    process1.stdout.listen(onProcessStdOut);
+    process1.stderr.listen(onProcessStdErr);
+    await process1.exitCode;
+
+    Process process2 = await Process.start(
+        'cp', ['-RH', 'macos/packaging/dmg/.', packagingDirectory.path]);
+    process2.stdout.listen(onProcessStdOut);
+    process2.stderr.listen(onProcessStdErr);
+    await process2.exitCode;
 
     File makeDmgConfigJsonFile =
         File('${packagingDirectory.path}/make_config.json');
     makeDmgConfigJsonFile.writeAsStringSync(json.encode(makeConfig.toJson()));
 
-    await exec('appdmg', [
+    Process process3 = await Process.start('appdmg', [
       makeDmgConfigJsonFile.path,
       makeConfig.outputFile.path,
     ]);
+    process3.stdout.listen(onProcessStdOut);
+    process3.stderr.listen(onProcessStdErr);
+
+    int exitCode = await process3.exitCode;
+    if (exitCode != 0) {
+      throw MakeError();
+    }
 
     packagingDirectory.deleteSync(recursive: true);
 

diff --git a/packages/app_package_maker_dmg/pubspec.lock b/packages/app_package_maker_dmg/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       path: "../app_package_maker"
       relative: true
     source: path
-    version: "0.1.0"
+    version: "0.1.3"
   charcode:
     dependency: transitive
     description:

diff --git a/packages/app_package_maker_dmg/pubspec.yaml b/packages/app_package_maker_dmg/pubspec.yaml
@@ -1,13 +1,13 @@
 name: app_package_maker_dmg
 description: Create a dmg package for your app.
-version: 0.1.0
+version: 0.1.3
 homepage: https://github.com/leanflutter/flutter_distributor
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
-  app_package_maker: ^0.1.0
+  app_package_maker: ^0.1.3
 
 # dependency_overrides:
 #   app_package_maker:

diff --git a/packages/app_package_maker_exe/lib/src/app_package_maker_exe.dart b/packages/app_package_maker_exe/lib/src/app_package_maker_exe.dart
@@ -28,6 +28,8 @@ class AppPackageMakerExe extends AppPackageMaker {
     Directory appDirectory, {
     required Directory outputDirectory,
     String? flavor,
+    void Function(List<int> data)? onProcessStdOut,
+    void Function(List<int> data)? onProcessStdErr,
   }) async {
     MakeConfig makeConfig = await loadMakeConfig()
       ..outputDirectory = outputDirectory;
@@ -56,15 +58,8 @@ class AppPackageMakerExe extends AppPackageMaker {
       p.join(innoSetupDirectory.path, 'ISCC.exe'),
       [setupScriptFile.path],
     );
-
-    process.stdout.listen((event) {
-      String log = utf8.decoder.convert(event).trim();
-      print(log);
-    });
-    process.stderr.listen((event) {
-      String log = utf8.decoder.convert(event).trim();
-      print(log);
-    });
+    process.stdout.listen(onProcessStdOut);
+    process.stderr.listen(onProcessStdErr);
 
     int exitCode = await process.exitCode;
     if (exitCode != 0) {

diff --git a/packages/app_package_maker_exe/pubspec.lock b/packages/app_package_maker_exe/pubspec.lock
@@ -7,7 +7,7 @@ packages:
       path: "../app_package_maker"
       relative: true
     source: path
-    version: "0.1.0"
+    version: "0.1.3"
   charcode:
     dependency: transitive
     description:
@@ -44,12 +44,12 @@ packages:
     source: hosted
     version: "1.7.0"
   path:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   pub_semver:
     dependency: transitive
     description:

diff --git a/packages/app_package_maker_exe/pubspec.yaml b/packages/app_package_maker_exe/pubspec.yaml
@@ -1,13 +1,14 @@
 name: app_package_maker_exe
 description: Create a exe package for your app.
-version: 0.1.0
+version: 0.1.3
 homepage: https://github.com/leanflutter/flutter_distributor
 
 environment:
   sdk: ">=2.12.0 <3.0.0"
 
 dependencies:
-  app_package_maker: ^0.1.0
+  app_package_maker: ^0.1.3
+  path: ^1.8.1
 
 # dependency_overrides:
 #   app_package_maker: