gym 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d221c7d18ac3da987d935bd33a9f685fa21250e9
-  data.tar.gz: c8d03871cc23bd4fbcb58b092979264c95b95e0b
+  metadata.gz: 3aa13efb7f20e58904e222dec34cca8f65350f26
+  data.tar.gz: dc0ebdf3f6e4b276e04d7f5252becb1f6f59699b
 SHA512:
-  metadata.gz: d1f37af43070d1db4a862028dc27728a62d6a3b57886ecea31619ac844974c2240c64f38f50f265099db204f417809a6d4a26ba88325758b1791c217fd49ae9e
-  data.tar.gz: 5d4752fc721f9b0783a138a6958f7698462118670f390a01ced7a45411c707bca990f4d96b1a116e28b3b3f3baf42fb28feb4bddd4d3fb4cec9ef01d2fd9d172
+  metadata.gz: c3becf6c82b015683bead10ca50772cf28c840e9f4275953d5a397151544440634094665a12117ffebb7cebbd6d4c4e69f50deaee7280f31047617568b617e84
+  data.tar.gz: c2a00723dcf72bac88afd0dc29e234dc31c908371a64eee84e284c4a2a744463372b917d5523b34f0162fc612f6831c2349ac363969af651a14b258465e8dfa2

data/lib/gym/detect_values.rb

@@ -24,6 +24,7 @@ module Gym
       detect_scheme
       detect_platform # we can only do that *after* we have the scheme
       detect_configuration
+      detect_toolchain
 
       config[:output_name] ||= Gym.project.app_name
 
@@ -88,5 +89,15 @@ module Gym
         end
       end
     end
+
+    # The toolchain parameter is used if you don't use the default toolchain of Xcode (e.g. Swift 2.3 with Xcode 8)
+    def self.detect_toolchain
+      return unless Gym.config[:toolchain]
+
+      # Convert the aliases to the full string to make it easier for the user #justfastlanethings
+      if Gym.config[:toolchain].to_s == "swift_2_3"
+        Gym.config[:toolchain] = "com.apple.dt.toolchain.Swift_2_3"
+      end
+    end
   end
 end

data/lib/gym/error_handler.rb

@@ -12,30 +12,30 @@ module Gym
           print "Invalid code signing settings"
           print "Your project defines a provisioning profile which doesn't exist on your local machine"
           print "You can use sigh (https://github.com/fastlane/fastlane/tree/master/sigh) to download and install the provisioning profile"
-          print "Follow this guide: https://github.com/fastlane/fastlane/tree/master/fastlane/docs/Codesigning"
+          print "Follow this guide: https://docs.fastlane.tools/codesigning/GettingStarted/"
         when /Provisioning profile does not match bundle identifier/
           print "Invalid code signing settings"
           print "Your project defines a provisioning profile that doesn't match the bundle identifier of your app"
           print "Make sure you use the correct provisioning profile for this app"
           print "Take a look at the ouptput above for more information"
-          print "You can follow this guide: https://github.com/fastlane/fastlane/tree/master/fastlane/docs/Codesigning"
+          print "You can follow this guide: https://docs.fastlane.tools/codesigning/GettingStarted/"
         when /provisioning profiles matching the bundle identifier .(.*)./ # the . around the (.*) are for the strange "
           print "You don't have the provisioning profile for '#{$1}' installed on the local machine"
           print "Make sure you have the profile on this computer and it's properly installed"
           print "You can use sigh (https://github.com/fastlane/fastlane/tree/master/sigh) to download and install the provisioning profile"
-          print "Follow this guide: https://github.com/fastlane/fastlane/tree/master/fastlane/docs/Codesigning"
+          print "Follow this guide: https://docs.fastlane.tools/codesigning/GettingStarted/"
         when /matching the bundle identifier .(.*). were found/ # the . around the (.*) are for the strange "
           print "You don't have a provisioning profile for the bundle identifier '#{$1}' installed on the local machine"
           print "Make sure you have the profile on this computer and it's properly installed"
           print "You can use sigh (https://github.com/fastlane/fastlane/tree/master/sigh) to download and install the provisioning profile"
-          print "Follow this guide: https://github.com/fastlane/fastlane/tree/master/fastlane/docs/Codesigning"
+          print "Follow this guide: https://docs.fastlane.tools/codesigning/GettingStarted/"
 
         # Insert more code signing specific errors here
         when /code signing is required/
           print "Your project settings define invalid code signing settings"
           print "To generate an ipa file you need to enable code signing for your project"
           print "Additionally make sure you have a code signing identity set"
-          print "Follow this guide: https://github.com/fastlane/fastlane/tree/master/fastlane/docs/Codesigning"
+          print "Follow this guide: https://docs.fastlane.tools/codesigning/GettingStarted/"
         when /US\-ASCII/
           print "Your shell environment is not correctly configured"
           print "Instead of UTF-8 your shell uses US-ASCII"
@@ -99,7 +99,7 @@ module Gym
         print "Usually it's caused by the `Skip Install` option in Xcode, set it to `NO`"
         print "For more information visit https://developer.apple.com/library/ios/technotes/tn2215/_index.html"
         print "Also, make sure to have a valid code signing identity and provisioning profile installed"
-        print "Follow this guide to setup code signing https://github.com/fastlane/fastlane/tree/master/fastlane/docs/Codesigning"
+        print "Follow this guide to setup code signing https://docs.fastlane.tools/codesigning/GettingStarted/"
         print "If your intention was only to export an ipa be sure to provide a valid archive at the archive path."
         UI.user_error!("Archive invalid")
       end

data/lib/gym/generators/package_command_generator_legacy.rb

@@ -96,10 +96,6 @@ module Gym
         if Gym.config[:export_method].to_s.length > 0
           UI.important "Legacy build api is enabled, the `export_method` value will be ignored"
         end
-
-        if Gym.config[:toolchain].to_s.length > 0
-          UI.important "Legacy build api is enabled, the `toolchain` value will be ignored"
-        end
       end
     end
   end

data/lib/gym/generators/package_command_generator_xcode7.rb

@@ -168,7 +168,7 @@ module Gym
         return if Gym.config[:provisioning_profile_path].to_s.length == 0
 
         UI.error "You're using Xcode 7, the `provisioning_profile_path` value will be ignored"
-        UI.error "Please follow the Code Signing Guide: https://codesigning.guide (for match) or https://github.com/fastlane/fastlane/tree/master/fastlane/docs/Codesigning"
+        UI.error "Please follow the Code Signing Guide: https://codesigning.guide (for match) or https://docs.fastlane.tools/codesigning/GettingStarted/"
       end
     end
   end

data/lib/gym/options.rb

@@ -162,7 +162,8 @@ module Gym
         FastlaneCore::ConfigItem.new(key: :toolchain,
                                      env_name: "GYM_TOOLCHAIN",
                                      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),
+                                     optional: true,
+                                     is_string: false),
         FastlaneCore::ConfigItem.new(key: :provisioning_profile_path,
                                      short_option: "-e",
                                      env_name: "GYM_PROVISIONING_PROFILE_PATH",

data/lib/gym/version.rb

@@ -1,4 +1,4 @@
 module Gym
-  VERSION = "1.9.0"
+  VERSION = "1.10.0"
   DESCRIPTION = "Building your iOS apps has never been easier"
 end

data/lib/gym/xcodebuild_fixes/swift_fix.rb

@@ -12,7 +12,7 @@ module Gym
       def swift_library_fix
         require 'fileutils'
 
-        return if check_for_swift PackageCommandGenerator
+        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*"]
@@ -27,14 +27,35 @@ module Gym
           ipa_swift_frameworks.each do |path|
             framework = File.basename(path)
 
-            FileUtils.copy_file("#{Xcode.xcode_path}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/iphoneos/#{framework}", File.join(swift_support, framework))
+            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(use_legacy_build_api: true, toolchain: :swift_2_3)")
+                UI.message("or")
+                UI.success("gym --use_legacy_build_api --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 $verbose
-            Runner.new.print_command(command_parts, "Fix Swift embedded code if needed") if $verbose
 
             FastlaneCore::CommandExecutor.execute(command: command_parts,
                                                 print_all: false,
@@ -46,6 +67,13 @@ module Gym
         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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gym
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.52.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.52.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -284,7 +284,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Building your iOS apps has never been easier