lib/gym.rb in gym-0.5.0 vs lib/gym.rb in gym-0.6.0

@@ -1,21 +1,17 @@
 require 'json'
 require 'gym/version'
 require 'gym/manager'
 require 'gym/project'
-require 'gym/build_command_generator'
-require 'gym/package_command_generator'
+require 'gym/generators/build_command_generator'
+require 'gym/generators/package_command_generator'
 require 'gym/runner'
 require 'gym/error_handler'
 require 'gym/options'
 require 'gym/detect_values'
+require 'gym/xcode'
 
-# Import all the fixes
-require 'gym/xcodebuild_fixes/swift_fix'
-require 'gym/xcodebuild_fixes/watchkit_fix'
-require 'gym/xcodebuild_fixes/package_application_fix'
-
 require 'fastlane_core'
 require 'terminal-table'
 
 module Gym
   class << self
@@ -30,12 +26,18 @@
 
     def gymfile_name
       "Gymfile"
     end
 
-    def xcode_path
-      @path ||= `xcode-select --print-path`.strip
+    def init_libs
+      return unless Xcode.pre_7?
+      # Import all the fixes
+      require 'gym/xcodebuild_fixes/swift_fix'
+      require 'gym/xcodebuild_fixes/watchkit_fix'
+      require 'gym/xcodebuild_fixes/package_application_fix'
     end
   end
 
   Helper = FastlaneCore::Helper # you gotta love Ruby: Helper.* should use the Helper class contained in FastlaneCore
+
+  Gym.init_libs
 end