Merge eebcc60a1f into 998d0459ad

ios/NebulaNetworkExtension/CtlInfo.h

@@ -1,5 +1,4 @@
 #include <stdint.h>
-#include <sys/types.h>
 
 /* <sys/kern_control.h> */
 #define CTLIOCGINFO 0xc0644e03UL

ios/fastlane/Fastfile

@@ -19,12 +19,43 @@ platform :ios do
   desc "Push a new beta build to TestFlight"
 
   lane :checkBuild do
+      # Do some things like setting up a temporary keystore to host secrets in CI
+      setup_ci
+
+      # Change signing behavior to work in CI
+      update_code_signing_settings(
+        # Automatic signing seems to be a good thing to have on in dev but will not work in CI
+        use_automatic_signing: false,
+        # The default value for this is iOS Development which is not appropriate for release
+        code_sign_identity: "Apple Distribution",
+      )
+
+      # Find our signing certs and profiles, these come from a private repository and managed by `fastlane match`
+      match(type: 'appstore', app_identifier: ["net.defined.mobileNebula","net.defined.mobileNebula.NebulaNetworkExtension"], readonly: true)
+
+      # Update our main program to have the correct provisioning profile from Apple
+      update_project_provisioning(
+        xcodeproj: "Runner.xcodeproj",
+        target_filter: "Runner",
+        # This comes from match() above
+        profile:ENV["sigh_net.defined.mobileNebula_appstore_profile-path"],
+        build_configuration: "Release"
+      )
+
+      # Update our network extension to have the correct provisioning profile from Apple
+      update_project_provisioning(
+        xcodeproj: "Runner.xcodeproj",
+        target_filter: "NebulaNetworkExtension",
+        # This comes from match() above
+        profile:ENV["sigh_net.defined.mobileNebula.NebulaNetworkExtension_appstore_profile-path"],
+        build_configuration: "Release"
+      )
+
       build_app(
         output_name: "MobileNebula.ipa",
         workspace: "Runner.xcworkspace",
         scheme: "Runner",
-        configuration: "Debug",
+        export_method: "app-store",
-        export_method: "development",
         export_options: {
           manageAppVersionAndBuildNumber: false
         }

lib/components/FormPage.dart

@@ -39,7 +39,7 @@ class _FormPageState extends State<FormPage> {
     changed = widget.changed || changed;
 
     return PopScope<Object?>(
-        canPop: !changed,
+        canPop: false,
         onPopInvokedWithResult: (bool didPop, Object? result) async {
           if (didPop) {
             return;

nebula/Makefile

@@ -1,8 +1,6 @@
 111MODULE = on
 export GO111MODULE
 
-unexport SWIFT_DEBUG_INFORMATION_VERSION
-unexport SWIFT_DEBUG_INFORMATION_FORMAT
 
 clean:
 	rm -rf mobileNebula.aar MobileNebula.xcframework