fastlane 2.42.0 → 2.43.0.beta.20170629010015

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca921083cf228537a4c3986df050549c4b5834a9
-  data.tar.gz: b9cd79f18b5c99a3f49ea02b8e3bc646e7919873
+  metadata.gz: 3e4ae66159f3544c063527f89087b2f4233f7aa0
+  data.tar.gz: 4916ef06ab21011ae37ad106bb7faf6a8360ed63
 SHA512:
-  metadata.gz: 63d0b9499642fd240ba31bf30f49f6006d1da76ea52241bb51011014dc06800d2b426ca31f09a37e59cd6df5c96f34dc43b199c2adadcee5f36d0936721f776b
-  data.tar.gz: 857df33bd8f3c27dbf2ca0042a6714f37e1f938e3c01fea19c5aa9243ca523a0f41ddeb8dd9756c0b60c6b12a6272e3baa1befdf3c421fb14eca4652944494ef
+  metadata.gz: cfef9394fa9471d5a728c722af5c2dcb0ef2167f24bf648a0732788f52fed5ee7a47a4446787c1488f078453ae37ba698c457ba8b8c40d5b6e4cd78f336f1b86
+  data.tar.gz: 3fccdfe1ad1594465a243d4e4feb740fd4ce0a8c440b95e43e5c6f60bf7697de1cfc06a1415a40ff24390cb4f38cb49da592e692bb8a8b13fdaa8ffe0541cc4b

data/fastlane/lib/fastlane/actions/gym.rb

@@ -9,13 +9,6 @@ module Fastlane
       def self.run(values)
         require 'gym'
 
-        should_use_legacy_api = values[:use_legacy_build_api] || Gym::Xcode.pre_7?
-
-        if values[:provisioning_profile_path].to_s.length.zero? && should_use_legacy_api
-          sigh_path = Actions.lane_context[SharedValues::SIGH_PROFILE_PATH] || ENV["SIGH_PROFILE_PATH"]
-          values[:provisioning_profile_path] = File.expand_path(sigh_path) if sigh_path
-        end
-
         values[:export_method] ||= Actions.lane_context[SharedValues::SIGH_PROFILE_TYPE]
 
         if Actions.lane_context[SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING]

data/fastlane/lib/fastlane/version.rb

@@ -1,4 +1,4 @@
 module Fastlane
-  VERSION = '2.42.0'.freeze
+  VERSION = '2.43.0.beta.20170629010015'.freeze
   DESCRIPTION = "The easiest way to automate beta deployments and releases for your iOS and Android apps".freeze
 end

data/gym/README.md

@@ -254,18 +254,6 @@ Using this method there are no workarounds for WatchKit or Swift required, as it
 
 Note: the [xcbuild-safe.sh script](https://github.com/fastlane/fastlane/tree/master/gym/lib/assets/wrap_xcodebuild/xcbuild-safe.sh) wraps around xcodebuild to workaround some incompatibilities.
 
-### Xcode 6 and below
-
-```
-/usr/bin/xcrun /path/to/PackageApplication4Gym -v \
-'/Users/felixkrause/Library/Developer/Xcode/Archives/2015-08-11/ExampleProductName 2015-08-11 18.15.30.xcarchive/Products/Applications/name.app' -o \
-'/Users/felixkrause/Library/Developer/Xcode/Archives/2015-08-11/ExampleProductName.ipa' \
---sign "identity" --embed "provProfile"
-```
-
-Note: the official PackageApplication script is replaced by a custom PackageApplication4Gym script. This script is obtained by applying a [set of patches](https://github.com/fastlane/fastlane/tree/master/gym/lib/assets/package_application_patches) on the fly to fix some known issues in the official Xcode PackageApplication script.
-
-Afterwards the `ipa` file is moved to the output folder. The `dSYM` file is compressed and moved to the output folder as well.
 
 # Tips
 ## [`fastlane`](https://fastlane.tools) Toolchain

data/gym/lib/gym.rb

@@ -32,11 +32,7 @@ module Gym
 
     def init_libs
       # Import all the fixes
-      require 'gym/xcodebuild_fixes/swift_fix'
-      require 'gym/xcodebuild_fixes/watchkit_fix'
-      require 'gym/xcodebuild_fixes/watchkit2_fix'
       require 'gym/xcodebuild_fixes/generic_archive_fix'
-      require 'gym/xcodebuild_fixes/package_application_fix'
     end
   end
 

data/gym/lib/gym/detect_values.rb

@@ -13,20 +13,12 @@ module Gym
       # Detect the project
       FastlaneCore::Project.detect_projects(config)
       Gym.project = FastlaneCore::Project.new(config)
-      detect_provisioning_profile
 
       # Go into the project's folder, as there might be a Gymfile there
       Dir.chdir(File.expand_path("..", Gym.project.path)) do
         config.load_configuration_file(Gym.gymfile_name)
       end
 
-      config[:use_legacy_build_api] = true if Xcode.pre_7?
-
-      if config[:use_legacy_build_api]
-        UI.deprecated("the use_legacy_build_api option is deprecated")
-        UI.deprecated("it should not be used anymore - e.g.: if you use app-extensions")
-      end
-
       detect_scheme
       detect_platform # we can only do that *after* we have the scheme
       detect_configuration
@@ -62,28 +54,6 @@ module Gym
       CFPropertyList.native_types(CFPropertyList::List.new(file: path).value)
     end
 
-    def self.detect_provisioning_profile
-      if Gym.config[:provisioning_profile_path].nil?
-        return unless Gym.config[:use_legacy_build_api] # we only want to auto-detect the profile when using the legacy build API
-
-        Dir.chdir(File.expand_path("..", Gym.project.path)) do
-          profiles = Dir["*.mobileprovision"]
-          if profiles.count == 1
-            profile = File.expand_path(profiles.last)
-          elsif profiles.count > 1
-            UI.message "Found more than one provisioning profile in the project directory:"
-            profile = choose(*profiles)
-          end
-
-          Gym.config[:provisioning_profile_path] = profile
-        end
-      end
-
-      if Gym.config[:provisioning_profile_path]
-        FastlaneCore::ProvisioningProfile.install(Gym.config[:provisioning_profile_path])
-      end
-    end
-
     def self.detect_scheme
       Gym.project.select_scheme
     end

data/gym/lib/gym/error_handler.rb

@@ -54,7 +54,6 @@ module Gym
         print_full_log_path
         print_xcode_path_instructions
         print_xcode_version
-        raise_legacy_build_api_error(output) if Gym.config[:use_legacy_build_api]
         UI.build_failure!("Error building the application - see the log above", error_info: output)
       end
 
@@ -104,15 +103,6 @@ module Gym
         return File.join(m[1], 'IDEDistribution.standard.log') unless m.nil?
       end
 
-      def raise_legacy_build_api_error(output)
-        UI.error("You enabled the legacy build API in _gym_")
-        UI.error("This option has been deprecated for about a year")
-        UI.error("and was removed with Xcode 8.3")
-        UI.error("Please update your Fastfile to include the export_method too")
-        UI.error("more information about how to migrate away: https://github.com/fastlane/fastlane/releases/tag/2.24.0")
-        UI.build_failure!("Build failed. Please remove the `use_legacy_build_api` option in your Fastfile and try again", error_info: output)
-      end
-
       private
 
       def read_standard_output(output)

data/gym/lib/gym/generators/package_command_generator.rb

@@ -7,7 +7,6 @@
 require 'shellwords'
 
 # The concrete implementations
-require 'gym/generators/package_command_generator_legacy'
 require 'gym/generators/package_command_generator_xcode7'
 
 module Gym
@@ -47,12 +46,10 @@ module Gym
       end
 
       # The generator we need to use for the currently used Xcode version
+      # Since we dropped Xcode 6 support, it's just this class, but maybe we'll have
+      # new classes in the future
       def generator
-        if Gym.config[:use_legacy_build_api]
-          PackageCommandGeneratorLegacy
-        else
-          PackageCommandGeneratorXcode7
-        end
+        PackageCommandGeneratorXcode7
       end
     end
   end

data/gym/lib/gym/generators/package_command_generator_xcode7.rb

@@ -13,9 +13,7 @@ module Gym
       DEFAULT_EXPORT_METHOD = "app-store"
 
       def generate
-        print_legacy_information
-
-        parts = ["/usr/bin/xcrun #{XcodebuildFixes.wrap_xcodebuild.shellescape} -exportArchive"]
+        parts = ["/usr/bin/xcrun #{wrap_xcodebuild.shellescape} -exportArchive"]
         parts += options
         parts += pipe
 
@@ -46,6 +44,12 @@ module Gym
         Gym.cache[:temporary_output_path] ||= Dir.mktmpdir('gym_output')
       end
 
+      # Wrap xcodebuild to work-around ipatool dependency to system ruby
+      def wrap_xcodebuild
+        require 'fileutils'
+        @wrapped_xcodebuild_path ||= File.join(Gym::ROOT, "lib/assets/wrap_xcodebuild/xcbuild-safe.sh")
+      end
+
       def ipa_path
         unless Gym.cache[:ipa_path]
           path = Dir[File.join(temporary_output_path, "*.ipa")].last
@@ -181,14 +185,6 @@ module Gym
       def to_plist(hash)
         Plist::Emit.dump(hash, true)
       end
-
-      def print_legacy_information
-        return if Gym.config[:provisioning_profile_path].to_s.length == 0
-
-        UI.error "You're using Xcode 7 or above, the `provisioning_profile_path` value will be ignored"
-        UI.error "Please follow the Code Signing Guide: https://codesigning.guide (for match) or https://docs.fastlane.tools/codesigning/GettingStarted/"
-        UI.error "This is just a warning, gym will continue running just as expected, but the parameter will be ignored"
-      end
     end
   end
 end

data/gym/lib/gym/options.rb

@@ -9,24 +9,6 @@ module Gym
       @options = plain_options
     end
 
-    def self.legacy_api_note!
-      UI.important "Unfortunately the legacy build API was removed with Xcode 8.3."
-      UI.important "Please make sure to remove use_legacy_build_api from your ./fastlane/Fastfile"
-      UI.important "and update the gym call to include the export method like this:"
-      UI.important "== App Store Builds =="
-      UI.error '     gym(scheme: "MyScheme", export_method: "app-store")'
-      UI.important "==  Ad Hoc Builds =="
-      UI.error '     gym(scheme: "MyScheme", export_method: "ad-hoc")'
-      UI.important "== Development Builds =="
-      UI.error '     gym(scheme: "MyScheme", export_method: "development")'
-      UI.important "== In-House Enterprise Builds =="
-      UI.error '     gym(scheme: "MyScheme", export_method: "enterprise")'
-      UI.important "If you run into a code signing error, please check out our troubleshooting guide for more information on how to solve the most common issues"
-      UI.error "    https://docs.fastlane.tools/codesigning/troubleshooting/ 🚀"
-      UI.important ""
-      UI.user_error! "legacy_build_api removed!"
-    end
-
     def self.plain_options
       [
         FastlaneCore::ConfigItem.new(key: :workspace,
@@ -117,20 +99,6 @@ module Gym
                                      description: "Should the ipa include bitcode?",
                                      is_string: false,
                                      optional: true),
-        FastlaneCore::ConfigItem.new(key: :use_legacy_build_api,
-                                     deprecated: "Don't use this option any more, as it's deprecated by Apple",
-                                     env_name: "GYM_USE_LEGACY_BUILD_API",
-                                     description: "Don't use this option any more, as it's deprecated by Apple",
-                                     default_value: false,
-                                     is_string: false,
-                                     verify_block: proc do |value|
-                                       if value
-                                         UI.important "Don't use this option any more, as it's deprecated by Apple"
-                                       end
-                                       if Gym::Xcode.legacy_api_deprecated?
-                                         Gym::Options.legacy_api_note!
-                                       end
-                                     end),
         FastlaneCore::ConfigItem.new(key: :export_method,
                                      short_option: "-j",
                                      env_name: "GYM_EXPORT_METHOD",
@@ -146,7 +114,6 @@ module Gym
                                      description: "Specifies path to export options plist. User xcodebuild -help to print the full set of available options",
                                      is_string: false,
                                      optional: true,
-                                     conflicting_options: [:use_legacy_build_api],
                                      conflict_block: proc do |value|
                                        UI.user_error!("'#{value.key}' must be false to use 'export_options'")
                                      end),
@@ -154,7 +121,6 @@ module Gym
                                      env_name: "GYM_EXPORT_XCARGS",
                                      description: "Pass additional arguments to xcodebuild for the package phase. Be sure to quote the setting names and values e.g. OTHER_LDFLAGS=\"-ObjC -lstdc++\"",
                                      optional: true,
-                                     conflicting_options: [:use_legacy_build_api],
                                      conflict_block: proc do |value|
                                        UI.user_error!("'#{value.key}' must be false to use 'export_xcargs'")
                                      end,
@@ -200,15 +166,6 @@ module Gym
                                      description: "The toolchain that should be used for building the application (e.g. com.apple.dt.toolchain.Swift_2_3, org.swift.30p620160816a)",
                                      optional: true,
                                      is_string: false),
-        FastlaneCore::ConfigItem.new(key: :provisioning_profile_path,
-                                     short_option: "-e",
-                                     env_name: "GYM_PROVISIONING_PROFILE_PATH",
-                                     description: "The path to the provisioning profile (optional)",
-                                     optional: true,
-                                     deprecated: 'Use target specific provisioning profiles instead',
-                                     verify_block: proc do |value|
-                                       UI.user_error!("Provisioning profile not found at path '#{File.expand_path(value)}'") unless File.exist?(File.expand_path(value))
-                                     end),
         FastlaneCore::ConfigItem.new(key: :destination,
                                      short_option: "-d",
                                      env_name: "GYM_DESTINATION",

data/gym/lib/gym/runner.rb

@@ -8,7 +8,6 @@ module Gym
     # @return (String) The path to the resulting ipa
     def run
       unless Gym.config[:skip_build_archive]
-        clear_old_files
         build_app
       end
       verify_archive
@@ -19,7 +18,6 @@ module Gym
         return BuildCommandGenerator.archive_path if Gym.config[:skip_package_ipa]
 
         package_app
-        fix_package
         compress_and_move_dsym
         path = move_ipa
         move_manifest
@@ -71,25 +69,11 @@ module Gym
     # @!group The individual steps
     #####################################################
 
-    def clear_old_files
-      return unless Gym.config[:use_legacy_build_api]
-      if File.exist?(PackageCommandGenerator.ipa_path)
-        File.delete(PackageCommandGenerator.ipa_path)
-      end
-    end
-
     def fix_generic_archive
       return unless FastlaneCore::Env.truthy?("GYM_USE_GENERIC_ARCHIVE_FIX")
       Gym::XcodebuildFixes.generic_archive_fix
     end
 
-    def fix_package
-      return unless Gym.config[:use_legacy_build_api]
-      Gym::XcodebuildFixes.swift_library_fix
-      Gym::XcodebuildFixes.watchkit_fix
-      Gym::XcodebuildFixes.watchkit2_fix
-    end
-
     def mark_archive_as_built_by_gym(archive_path)
       escaped_archive_path = archive_path.shellescape
       system("xattr -w info.fastlane.generated_by_gym 1 #{escaped_archive_path}")
@@ -239,11 +223,7 @@ module Gym
     end
 
     def find_archive_path
-      if Gym.config[:use_legacy_build_api]
-        BuildCommandGenerator.archive_path
-      else
-        Dir.glob(File.join(BuildCommandGenerator.build_path, "*.ipa")).last
-      end
+      Dir.glob(File.join(BuildCommandGenerator.build_path, "*.ipa")).last
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastlane
 version: !ruby/object:Gem::Version
-  version: 2.42.0
+  version: 2.43.0.beta.20170629010015
 platform: ruby
 authors:
 - Felix Krause
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-notifier
@@ -259,7 +259,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.4.5
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
@@ -269,7 +269,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.4.0
+        version: 4.4.5
     - - "<"
       - !ruby/object:Gem::Version
         version: 5.0.0
@@ -1147,9 +1147,6 @@ files:
 - frameit/lib/frameit/template_finder.rb
 - gym/README.md
 - gym/lib/assets/GymfileTemplate
-- gym/lib/assets/package_application_patches/0001_codesign_args_patch.diff
-- gym/lib/assets/package_application_patches/0002_no_strict_parameter_patch.diff
-- gym/lib/assets/package_application_patches/PackageApplication_MD5
 - gym/lib/assets/wrap_xcodebuild/xcbuild-safe.sh
 - gym/lib/gym.rb
 - gym/lib/gym/commands_generator.rb
@@ -1158,7 +1155,6 @@ files:
 - gym/lib/gym/generators/README.md
 - gym/lib/gym/generators/build_command_generator.rb
 - gym/lib/gym/generators/package_command_generator.rb
-- gym/lib/gym/generators/package_command_generator_legacy.rb
 - gym/lib/gym/generators/package_command_generator_xcode7.rb
 - gym/lib/gym/manager.rb
 - gym/lib/gym/options.rb
@@ -1166,10 +1162,6 @@ files:
 - gym/lib/gym/xcode.rb
 - gym/lib/gym/xcodebuild_fixes/README.md
 - gym/lib/gym/xcodebuild_fixes/generic_archive_fix.rb
-- gym/lib/gym/xcodebuild_fixes/package_application_fix.rb
-- gym/lib/gym/xcodebuild_fixes/swift_fix.rb
-- gym/lib/gym/xcodebuild_fixes/watchkit2_fix.rb
-- gym/lib/gym/xcodebuild_fixes/watchkit_fix.rb
 - match/README.md
 - match/lib/assets/MatchfileTemplate
 - match/lib/assets/READMETemplate.md
@@ -1296,7 +1288,6 @@ files:
 - spaceship/lib/assets/languageMapping.json
 - spaceship/lib/assets/languageMappingReadable.json
 - spaceship/lib/spaceship.rb
-- spaceship/lib/spaceship/.DS_Store
 - spaceship/lib/spaceship/babosa_fix.rb
 - spaceship/lib/spaceship/base.rb
 - spaceship/lib/spaceship/client.rb
@@ -1398,24 +1389,24 @@ metadata:
 post_install_message: 
 rdoc_options: []
 require_paths:
+- snapshot/lib
+- spaceship/lib
+- scan/lib
 - cert/lib
-- credentials_manager/lib
-- deliver/lib
+- pilot/lib
 - fastlane/lib
-- fastlane_core/lib
-- frameit/lib
+- supply/lib
 - gym/lib
 - match/lib
-- pem/lib
-- pilot/lib
+- sigh/lib
 - precheck/lib
 - produce/lib
-- scan/lib
+- credentials_manager/lib
 - screengrab/lib
-- sigh/lib
-- snapshot/lib
-- spaceship/lib
-- supply/lib
+- pem/lib
+- fastlane_core/lib
+- deliver/lib
+- frameit/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -1423,15 +1414,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: The easiest way to automate beta deployments and releases for your iOS and
   Android apps
 test_files: []
-has_rdoc: 

data/gym/lib/assets/package_application_patches/0001_codesign_args_patch.diff

@@ -1,38 +0,0 @@
-From 13f2c76fd11b0d861ddf205d4d6ccc0c45a0d4b2 Mon Sep 17 00:00:00 2001
-From: Fabio Milano
-Date: Thu, 13 Aug 2015 15:02:41 +0200
-Subject: [PATCH] Fixed codesign_args
-
-Code signatures made in Mavericks and later do not support altering which files are sealed by a code signature.
-The --resource-rules option to codesign isn't supported anymore
-
-See https://developer.apple.com/library/mac/technotes/tn2206/_index.html#//apple_ref/doc/uid/DTS40007919-CH1-TNTAG206
-
----
- PackageApplication4Gym | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/PackageApplication4Gym b/PackageApplication4Gym
-index fc4d7de..b97431f 100755
---- a/PackageApplication4Gym
-+++ b/PackageApplication4Gym
-@@ -152,9 +152,15 @@ if ( defined $opt{sign} ) {
-         }
-     }
- 
--    my @codesign_args = ("/usr/bin/codesign", "--force", "--preserve-metadata=identifier,entitlements,resource-rules",
-+    my @codesign_args;
-+    if (-e '$destApp/ResourceRules.plist') {  # If ResourceRules.plist exists, include it in codesign arguments, for backwards compatability
-+        @codesign_args = ("/usr/bin/codesign", "--force", "--preserve-metadata=identifier,entitlements,resource-rules",
-                          "--sign", $opt{sign},
-                          "--resource-rules=$destApp/ResourceRules.plist");
-+    } else { # If ResourceRules.plist isn't found, don't include it in the codesign arguments
-+        @codesign_args = ("/usr/bin/codesign", "--force", "--preserve-metadata=identifier,entitlements",
-+                         "--sign", $opt{sign});
-+    }
- 
-     if ( -e $entitlements_plist ) {
-         push(@codesign_args, '--entitlements');
--- 
-2.2.1
-

data/gym/lib/assets/package_application_patches/0002_no_strict_parameter_patch.diff

@@ -1,42 +0,0 @@
-From 38ea965869a436c4b60e7dbfd5a28d42232d82d6 Mon Sep 17 00:00:00 2001
-From: Fabio Milano
-Date: Thu, 13 Aug 2015 16:03:26 +0200
-Subject: [PATCH] Added no-strict parameter
-
-The command line tool “codesign” has changed in 10.9.5 and 10.10, you need to
-pass “--no-strict” option to the command, (the problem has been reported and
-will be fixed). To workaround the problem, please save a copy and modify
-PackageApplication to pass “—no-strict” to codesign, you can locate PackageApplication
-by running the following:- xcrun -sdk iphoneos -f PackageApplication
-
-See https://stackoverflow.com/questions/26008449/xcodebuild-codesign-vvvv-saysresource-envelope-is-obsolete
-
----
- PackageApplication4Gym | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/PackageApplication4Gym b/PackageApplication4Gym
-index 3085608..54a4b9e 100755
---- a/PackageApplication4Gym
-+++ b/PackageApplication4Gym
-@@ -92,7 +92,7 @@ foreach $plugin (@plugins) {
-     chomp $pluginName;
-     my $destPlugin = "$destAppDir/$pluginName";
-     
--    my $result = runCmd("/usr/bin/codesign", "--verify", "-vvvv", , $plugin );
-+    my $result = runCmd("/usr/bin/codesign", "--verify", "--no-strict", "-vvvv", , $plugin );
-     if ( $result !~ /valid on disk/ ) {
-         fatal("Codesign check fails : $result\n");
-     }
-@@ -111,7 +111,7 @@ if ( $opt{symbols} ) {
- 
- if ( $opt{verbose} ) {
-     print "### Checking original app\n";
--    my $result = runCmd("/usr/bin/codesign", "--verify", "-vvvv", , $origApp );
-+    my $result = runCmd("/usr/bin/codesign", "--verify", "--no-strict", "-vvvv", , $origApp );
-     if ( $result !~ /valid on disk/ ) {
-         print "Codesign check fails : $result\n";
-     }
--- 
-2.2.1
-

data/gym/lib/assets/package_application_patches/PackageApplication_MD5

@@ -1,2 +0,0 @@
-a434316d561ce5c4392a8447b58c18e7
-75c29555834c603566a2319c5e4d2838

data/gym/lib/gym/generators/package_command_generator_legacy.rb

@@ -1,103 +0,0 @@
-# encoding: utf-8
-
-# from https://stackoverflow.com/a/9857493/445598
-# because of
-# `incompatible encoding regexp match (UTF-8 regexp with ASCII-8BIT string) (Encoding::CompatibilityError)`
-
-module Gym
-  # Responsible for building the fully working xcodebuild command on Xcode < 7
-  #
-  # Because of a known bug in PackageApplication Perl script used by Xcode the packaging process is performed with
-  # a patched version of the script.
-  class PackageCommandGeneratorLegacy
-    class << self
-      def generate
-        print_legacy_information
-
-        parts = ["/usr/bin/xcrun #{XcodebuildFixes.patch_package_application.shellescape} -v"]
-        parts += options
-        parts += pipe
-
-        parts
-      end
-
-      def options
-        options = []
-
-        options << Shellwords.escape(appfile_path)
-        options << "-o '#{ipa_path}'"
-        options << "exportFormat ipa"
-
-        if Gym.config[:provisioning_profile_path]
-          options << "--embed '#{Gym.config[:provisioning_profile_path]}'"
-        end
-
-        if Gym.config[:codesigning_identity]
-          options << "--sign #{Gym.config[:codesigning_identity].shellescape}"
-        end
-
-        options
-      end
-
-      def pipe
-        [""]
-      end
-
-      # Place where the IPA file will be created, so it can be safely moved to the destination folder
-      def temporary_output_path
-        Gym.cache[:temporary_output_path] ||= Dir.mktmpdir('gym_output')
-      end
-
-      def appfile_path
-        path = Dir.glob("#{BuildCommandGenerator.archive_path}/Products/Applications/*.app").first
-        path ||= Dir[BuildCommandGenerator.archive_path + "/**/*.app"].first
-
-        return path
-      end
-
-      # We export it to the temporary folder and move it over to the actual output once it's finished and valid
-      def ipa_path
-        File.join(temporary_output_path, "#{Gym.config[:output_name]}.ipa")
-      end
-
-      # The path the the dsym file for this app. Might be nil
-      def dsym_path
-        Dir[BuildCommandGenerator.archive_path + "/**/*.app.dSYM"].last
-      end
-
-      def manifest_path
-        ""
-      end
-
-      def app_thinning_path
-        ""
-      end
-
-      def app_thinning_size_report_path
-        ""
-      end
-
-      def apps_path
-        ""
-      end
-
-      def print_legacy_information
-        if Gym.config[:include_bitcode]
-          UI.important "Legacy build api is enabled, the `include_bitcode` value will be ignored"
-        end
-
-        if Gym.config[:include_symbols]
-          UI.important "Legacy build api is enabled, the `include_symbols` value will be ignored"
-        end
-
-        if Gym.config[:export_team_id].to_s.length > 0
-          UI.important "Legacy build api is enabled, the `export_team_id` value will be ignored"
-        end
-
-        if Gym.config[:export_method].to_s.length > 0
-          UI.important "Legacy build api is enabled, the `export_method` value will be ignored"
-        end
-      end
-    end
-  end
-end

data/gym/lib/gym/xcodebuild_fixes/package_application_fix.rb

@@ -1,57 +0,0 @@
-module Gym
-  class XcodebuildFixes
-    class << self
-      # Fix PackageApplication Perl script by Xcode to create the IPA from the archive
-      def patch_package_application
-        require 'fileutils'
-
-        # Initialization
-        @patched_package_application_path = File.join("/tmp", "PackageApplication4Gym")
-
-        return @patched_package_application_path if File.exist?(@patched_package_application_path)
-
-        Dir.mktmpdir do |tmpdir|
-          # Check current set of PackageApplication MD5 hashes
-          require 'digest'
-
-          path = File.join(Gym::ROOT, "lib/assets/package_application_patches/PackageApplication_MD5")
-          expected_md5_hashes = File.read(path).split("\n")
-
-          # If that location changes, search it using xcrun --sdk iphoneos -f PackageApplication
-          package_application_path = "#{Xcode.xcode_path}/Platforms/iPhoneOS.platform/Developer/usr/bin/PackageApplication"
-
-          unless File.exist?(package_application_path)
-            ErrorHandler.raise_legacy_build_api_error("")
-          end
-
-          UI.crash!("Unable to patch the `PackageApplication` script bundled in Xcode. This is not supported.") unless expected_md5_hashes.include?(Digest::MD5.file(package_application_path).hexdigest)
-
-          # Duplicate PackageApplication script to PackageApplication4Gym
-          FileUtils.copy_file(package_application_path, @patched_package_application_path)
-
-          # Apply patches to PackageApplication4Gym from patches folder
-          Dir[File.join(Gym::ROOT, "lib/assets/package_application_patches/*.diff")].each do |patch|
-            UI.verbose "Applying Package Application patch: #{File.basename(patch)}"
-            command = ["patch '#{@patched_package_application_path}' < '#{patch}'"]
-            Runner.new.print_command(command, "Applying Package Application patch: #{File.basename(patch)}") if FastlaneCore::Globals.verbose?
-
-            FastlaneCore::CommandExecutor.execute(command: command,
-                                                print_all: false,
-                                            print_command: FastlaneCore::Globals.verbose?,
-                                                    error: proc do |output|
-                                                      ErrorHandler.handle_package_error(output)
-                                                    end)
-          end
-        end
-
-        return @patched_package_application_path # Return path to the patched PackageApplication
-      end
-
-      # Wrap xcodebuild to work-around ipatool dependecy to system ruby
-      def wrap_xcodebuild
-        require 'fileutils'
-        @wrapped_xcodebuild_path ||= File.join(Gym::ROOT, "lib/assets/wrap_xcodebuild/xcbuild-safe.sh")
-      end
-    end
-  end
-end

data/gym/lib/gym/xcodebuild_fixes/swift_fix.rb

@@ -1,100 +0,0 @@
-# encoding: utf-8
-
-# from https://stackoverflow.com/a/9857493/445598
-# because of
-# `incompatible encoding regexp match (UTF-8 regexp with ASCII-8BIT string) (Encoding::CompatibilityError)`
-require 'zip'
-
-module Gym
-  class XcodebuildFixes
-    class << self
-      # Determine whether it is a Swift project and, eventually, include all required libraries to copy from Xcode's toolchain directory.
-      # Since there's no "xcodebuild" target to do just that, it is done post-build when exporting an archived build.
-      def swift_library_fix
-        require 'fileutils'
-
-        return if check_for_swift(PackageCommandGenerator)
-
-        UI.verbose "Packaging up the Swift Framework as the current app is a Swift app"
-        ipa_swift_frameworks = Dir["#{PackageCommandGenerator.appfile_path}/Frameworks/libswift*"]
-
-        Dir.mktmpdir do |tmpdir|
-          # Copy all necessary Swift libraries to a temporary "SwiftSupport" directory so that we can
-          # easily add it to the .ipa later.
-          swift_support = File.join(tmpdir, "SwiftSupport")
-
-          Dir.mkdir(swift_support)
-
-          ipa_swift_frameworks.each do |path|
-            framework = File.basename(path)
-
-            begin
-              toolchain_dir = toolchain_dir_name_for_toolchain(Gym.config[:toolchain])
-
-              from = File.join(Xcode.xcode_path, "Toolchains/#{toolchain_dir}/usr/lib/swift/iphoneos/#{framework}")
-              to = File.join(swift_support, framework)
-
-              UI.verbose("Copying Swift framework from '#{from}'")
-              FileUtils.copy_file(from, to)
-            rescue => ex
-              UI.error("Error copying over framework file. Please try running gym without the legacy build API enabled")
-              UI.error("For more information visit https://github.com/fastlane/fastlane/issues/5863")
-              UI.error("Missing file #{path} inside #{Xcode.xcode_path}")
-
-              if Gym.config[:toolchain].nil?
-                UI.important("If you're using Swift 2.3, but already updated to Xcode 8")
-                UI.important("try adding the following parameter to your gym call:")
-                UI.success("gym(toolchain: :swift_2_3)")
-                UI.message("or")
-                UI.success("fastlane gym --toolchain swift_2_3")
-              end
-
-              UI.user_error!(ex)
-            end
-          end
-
-          # Add "SwiftSupport" to the .ipa archive
-          Dir.chdir(tmpdir) do
-            command_parts = ["zip --recurse-paths '#{PackageCommandGenerator.ipa_path}' SwiftSupport"]
-            command_parts << "> /dev/null" unless FastlaneCore::Globals.verbose?
-
-            FastlaneCore::CommandExecutor.execute(command: command_parts,
-                                                print_all: false,
-                                            print_command: !Gym.config[:silent],
-                                                    error: proc do |output|
-                                                      ErrorHandler.handle_package_error(output)
-                                                    end)
-          end
-        end
-      end
-
-      def toolchain_dir_name_for_toolchain(toolchain)
-        return "Swift_2.3.xctoolchain" if toolchain == "com.apple.dt.toolchain.Swift_2_3"
-
-        UI.error("No specific folder was found for toolchain #{toolchain}. Using the default toolchain location.") if toolchain
-        return "XcodeDefault.xctoolchain"
-      end
-
-      # @param the PackageCommandGenerator
-      # @return true if swift
-      def check_for_swift(pcg)
-        UI.verbose "Checking for Swift framework"
-        default_swift_libs = "#{pcg.appfile_path}/Frameworks/libswift.*" # note the extra ., this is a string representation of a regexp
-        zip_entries_matching(pcg.ipa_path, /#{default_swift_libs}/).count > 0
-      end
-
-      # return the entries (files or directories) in the zip matching the pattern
-      # @param zipfile a zipfile
-      # @return the files or directories matching the pattern
-      def zip_entries_matching(zipfile, file_pattern)
-        files = []
-        Zip::File.open(zipfile) do |zip_file|
-          zip_file.each do |entry|
-            files << entry.name if entry.name.force_encoding("utf-8").match file_pattern
-          end
-        end
-        files
-      end
-    end
-  end
-end

data/gym/lib/gym/xcodebuild_fixes/watchkit2_fix.rb

@@ -1,35 +0,0 @@
-module Gym
-  class XcodebuildFixes
-    class << self
-      # Determine whether this app has WatchKit2 support and manually package up the WatchKit2 framework
-      def watchkit2_fix
-        return unless watchkit2?
-
-        UI.verbose "Adding WatchKit2 support"
-
-        Dir.mktmpdir do |tmpdir|
-          # Make watchkit support directory
-          watchkit_support = File.join(tmpdir, "WatchKitSupport2")
-          Dir.mkdir(watchkit_support)
-
-          # Copy WK from Xcode into WatchKitSupport2
-          FileUtils.copy_file("#{Xcode.xcode_path}/Platforms/WatchOS.platform/Developer/SDKs/WatchOS.sdk/Library/Application Support/WatchKit/WK", File.join(watchkit_support, "WK"))
-
-          # Add "WatchKitSupport2" to the .ipa archive
-          Dir.chdir(tmpdir) do
-            abort unless system %(zip --recurse-paths "#{PackageCommandGenerator.ipa_path}" "WatchKitSupport2" > /dev/null)
-          end
-
-          UI.verbose "Successfully added WatchKit2 support"
-        end
-      end
-
-      # Does this application have a WatchKit target
-      def watchkit2?
-        Dir["#{PackageCommandGenerator.appfile_path}/**/*.plist"].any? do |plist_path|
-          `/usr/libexec/PlistBuddy -c 'Print DTSDKName' '#{plist_path}' 2>&1`.match(/^\s*watchos2\.\d+\s*$/)
-        end
-      end
-    end
-  end
-end

data/gym/lib/gym/xcodebuild_fixes/watchkit_fix.rb

@@ -1,40 +0,0 @@
-module Gym
-  class XcodebuildFixes
-    class << self
-      # Determine whether this app has WatchKit support and manually package up the WatchKit framework
-      def watchkit_fix
-        return unless should_apply_watchkit1_fix?
-
-        UI.verbose "Adding WatchKit support"
-
-        Dir.mktmpdir do |tmpdir|
-          # Make watchkit support directory
-          watchkit_support = File.join(tmpdir, "WatchKitSupport")
-          Dir.mkdir(watchkit_support)
-
-          # Copy WK from Xcode into WatchKitSupport
-          FileUtils.copy_file("#{Xcode.xcode_path}/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/Library/Application Support/WatchKit/WK", File.join(watchkit_support, "WK"))
-
-          # Add "WatchKitSupport" to the .ipa archive
-          Dir.chdir(tmpdir) do
-            abort unless system %(zip --recurse-paths "#{PackageCommandGenerator.ipa_path}" "WatchKitSupport" > /dev/null)
-          end
-
-          UI.verbose "Successfully added WatchKit support"
-        end
-      end
-
-      # Does this application have a WatchKit target
-      def watchkit?
-        Dir["#{PackageCommandGenerator.appfile_path}/**/*.plist"].any? do |plist_path|
-          `/usr/libexec/PlistBuddy -c 'Print WKWatchKitApp' '#{plist_path}' 2>&1`.strip == 'true'
-        end
-      end
-
-      # Should only be applied if watchkit app is not a watchkit2 app
-      def should_apply_watchkit1_fix?
-        watchkit? && !Gym::XcodebuildFixes.watchkit2?
-      end
-    end
-  end
-end