release/v0.0.1 dev.5 (#9)

yardexx · Dec 18, 2022 · 199b6e2 · 199b6e2
1 parent 25f345d
commit 199b6e2
Show file tree

Hide file tree

Showing 16 changed files with 524 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,4 +31,15 @@
 
 ## 🎯 Improvements
 - Updated README
-- Updated CHANGELOG (uhm... sorry about that 😅)
+- Updated CHANGELOG (uhm... sorry about that 😅)
+
+# 0.0.1-dev.5
+## ✨ New Features
+- Optional automatic iOS script insertion in Runner.xcscheme - experimental (iOS)
+
+## 🎯 Improvements
+- Updated README
+
+## 🛠 Fixed issues
+- Fixed incorrect `mason` version in `brick.yaml`
+- Specified explicit `mason` version to `>=0.1.0-dev.39` in `pubspec.yaml`
diff --git a/README.md b/README.md
@@ -27,6 +27,7 @@ way to create configuration.
 - 🎯 Dependency check using `pub get`
 - 🔧 Fix apply using `dart fix`
 - 🤖 Android SDK level check and automatic update
+- 🍎 iOS script insertion in Runner.xcscheme (Experimental)
 
 ## How to add ➕
 This brick is currently **NOT** available on [brickhub.dev](https://brickhub.dev/). 

diff --git a/brick.yaml b/brick.yaml
@@ -1,10 +1,10 @@
 name: freerasp_brick
 description: A brick for configuration generation and automatic setup for freeRASP.
 
-version: 0.0.1-dev.4
+version: 0.0.1-dev.5
 
 environment:
-  mason: ">=0.1.0-dev.40 <0.1.0"
+  mason: ">=0.1.0-dev.39 <0.1.0"
 
 vars:
   watcher_mail:

diff --git a/hooks/errors/freerasp_brick_exception.dart b/hooks/errors/freerasp_brick_exception.dart
@@ -15,10 +15,25 @@ class FreeRaspBrickException implements Exception {
     );
   }
 
-  factory FreeRaspBrickException.gradleUpdateFailure({StackTrace? stackTrace}) {
+  factory FreeRaspBrickException.gradleUpdateFailure({
+    String? message,
+    StackTrace? stackTrace,
+  }) {
     return FreeRaspBrickException(
       code: 'gradle-failure',
-      message: 'Issue occurred during update of gradle file.',
+      message: message ?? 'Issue occurred during update of gradle file.',
+      stackTrace: stackTrace,
+    );
+  }
+
+  factory FreeRaspBrickException.schemeUpdateFailure({
+    String? message,
+    StackTrace? stackTrace,
+  }) {
+    return FreeRaspBrickException(
+      code: 'xcscheme-failure',
+      message:
+          message ?? 'Issue occurred during update of Runner.xcscheme file.',
       stackTrace: stackTrace,
     );
   }

diff --git a/hooks/post_gen.dart b/hooks/post_gen.dart
@@ -3,18 +3,18 @@ import 'dart:io';
 
 import 'package:mason/mason.dart';
 
-import 'utils/gradle_updater.dart';
+import 'utils/utils.dart';
 
 const String androidBuild = 'build.gradle';
 const String flutterBuild = 'lib';
 
 Future<void> run(HookContext context) async {
   final logger = context.logger;
-
   await _runPubAdd(logger);
   await _runPubGet(logger);
   await _runDartFix(logger);
   await _runGradleCheck(context);
+  await _runSchemeCheck(context);
 }
 
 Future<void> _runPubAdd(Logger logger) async {
@@ -53,13 +53,13 @@ Future<void> _runDartFix(Logger logger) async {
 Future<void> _runGradleCheck(HookContext context) async {
   final progress = context.logger.progress('Checking build.gradle file');
 
-  if (!(context.vars['check_gradle'] as bool)) {
+  if (!(context.vars['update_gradle'] as bool)) {
     progress.complete('Gradle check not required. Skipping...');
     return;
   }
 
   try {
-    final hasUpdated = gradleUpdate('android/app/build.gradle');
+    final hasUpdated = GradleUpdater.update('android/app/build.gradle');
     progress.complete(
       hasUpdated
           ? 'build.gradle successfully updated'
@@ -69,3 +69,20 @@ Future<void> _runGradleCheck(HookContext context) async {
     progress.fail("Couldn't update build.gradle");
   }
 }
+
+Future<void> _runSchemeCheck(HookContext context) async {
+  final progress = context.logger.progress('Checking xcscheme file');
+
+  if (!(context.vars['update_scheme'] as bool)) {
+    progress.complete('Xcscheme check not required. Skipping...');
+    return;
+  }
+
+  try {
+    SchemeUpdater.update(
+      'ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme',
+    );
+  } catch (e) {
+    progress.fail("Couldn't update xcscheme");
+  }
+}
diff --git a/hooks/pre_gen.dart b/hooks/pre_gen.dart
@@ -27,9 +27,15 @@ void parseCupertinoData(HookContext context) {
     defaultValue: defaultAppPackage,
   );
 
+  final updateScheme = logger.masonConfirm(
+    'Do you want to update Runner.xcscheme?',
+    defaultValue: true,
+  );
+
   context.vars.addAll({
     'bundle_id': bundleId,
     'team_id': teamId,
+    'update_scheme': updateScheme,
   });
 }
 
@@ -43,14 +49,14 @@ void parseAndroidData(HookContext context) {
 
   final signingHash = logger.masonPrompt("What's app singing hash?");
 
-  final checkGradle = logger.masonConfirm(
+  final updateGradle = logger.masonConfirm(
     'Do you want to check and update API level (minSdkVersion)?',
     defaultValue: true,
   );
 
   context.vars.addAll({
     'package_name': packageName,
     'signing_hash': signingHash,
-    'check_gradle': checkGradle,
+    'update_gradle': updateGradle,
   });
 }
diff --git a/hooks/pubspec.yaml b/hooks/pubspec.yaml
@@ -5,7 +5,7 @@ environment:
 
 dependencies:
   file: ^6.1.4
-  mason: ^0.1.0-dev
+  mason: ^0.1.0-dev.39
 
 dev_dependencies:
   test: ^1.22.0

diff --git a/hooks/test/test_inputs/xcscheme_files/invalid/missing_build_action_entries.dart b/hooks/test/test_inputs/xcscheme_files/invalid/missing_build_action_entries.dart
@@ -0,0 +1,73 @@
+const missingBuildActionEntries = '''
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1300"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Profile"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
+''';
diff --git a/hooks/test/test_inputs/xcscheme_files/valid/contains_pre_actions.dart b/hooks/test/test_inputs/xcscheme_files/valid/contains_pre_actions.dart
@@ -0,0 +1,98 @@
+const containsPreActions = '''
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1300"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Script"
+               scriptText = "echo &quot;Hello&quot;">
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+               BuildableName = "Runner.app"
+               BlueprintName = "Runner"
+               ReferencedContainer = "container:Runner.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Profile"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
+''';