fastlane-craft 1.4.0 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b8499c0d0064edadabc667cce7b5ed6be67e96d9d08567b0be91daf95917ac3
-  data.tar.gz: fdc52b0ac3cc687875fca4d19498cf075a920114b6ac5096732a05aa51914ee5
+  metadata.gz: af83c5009022f0ea6d71c461147f7237b7e508ffc356a6fd73a79ba1c52106fa
+  data.tar.gz: 37e443e5275e9004b5413f0a4f38f6d13dbcdf1a91b09486d4792e250241bd41
 SHA512:
-  metadata.gz: 67f72ff63a3a609d43b4614c9642e80eee843a7221afa2f091c2eb2b6860ca19dd71f64c440767a8a7d4eca83da55573e8627a7d16532dc84336b0172348ce25
-  data.tar.gz: a681ce300e49fb8350255e96115f99de2a868d16af584de19be3c22fa9acb0e80b3b42c148b33f2a8c5977d8cebdbf96adc86bf2a78427d466647639abf36521
+  metadata.gz: b63744dc924a13ba5deac43665c5d2d68d51c9e824fe2f79d70a6033db27e808249f2a0cf1fcf3c8dfeb211d5f1bdcb2782d701eba9ce7ac9dc8929b3270fbce
+  data.tar.gz: bdebb841815f94db7ff7006991e531653505c15d45b7a223fd926e79cd8975f5827c1ae4a03e685355ce2ce3cbd09654f51c744beefc469eaa1e22361aea4f40

data/lib/fastlane-craft/app_release.rb

@@ -5,9 +5,8 @@ module Fastlane
     class AppReleaseAction < Action
       def self.run(params)
         FastlaneCraft::AppReleaseManager.new(
-          params[:scheme],
-          params[:info_plist],
-          params[:extra_info_plists],
+          params[:schemes],
+          params[:project],
           params[:branch],
           params[:version],
           params[:target_suffix]
@@ -29,28 +28,21 @@ module Fastlane
       def self.available_options
         [
           FastlaneCore::ConfigItem.new(
-            key: :scheme,
-            description: 'project scheme',
-            verify_block: proc do |value|
-              UI.user_error!('empty scheme') if value.empty?
-            end
-          ),
-          FastlaneCore::ConfigItem.new(
-            key: :info_plist,
-            description: 'target info plist path',
+            key: :schemes,
+            description: 'schemes',
+            type: Array,
             verify_block: proc do |value|
-              msg = 'info plist path not found'
-              UI.user_error!(msg) unless File.file?(value)
+              msg = 'invalid or empty schemes'
+              UI.user_error!(msg) if value.empty?
             end
           ),
           FastlaneCore::ConfigItem.new(
-            key: :extra_info_plists,
-            description: 'extra info plists paths',
-            type: Array,
-            default_value: [],
+            key: :project,
+            description: 'path to xcodeproj',
+            default_value: Dir.glob('*.xcodeproj').first,
             verify_block: proc do |value|
-              msg = 'invalid info plists paths'
-              UI.user_error!(msg) unless value.all? { |p| File.file?(p) }
+              msg = 'xcodeproj not found'
+              UI.user_error!(msg) unless File.directory?(value)
             end
           ),
           FastlaneCore::ConfigItem.new(
@@ -77,13 +69,11 @@ module Fastlane
       def self.example_code
         [
           'app_release(
-            scheme: "AppScheme",
-            info_plist: "/path/to/info/plist"
+            schemes: ["AppScheme", "AppExtension"]
           )',
           'app_release(
-            scheme: "Application",
-            info_plist: "/path/to/info/plist",
-            extra_info_plists: ["plist1", "plist2"],
+            schemes: ["AppScheme", "AppExtension"],
+            project: "/path/to/xcodeproj",
             branch: "master",
             version: "2.3.0",
             target_suffix: "_sfx"

data/lib/fastlane-craft/app_release_manager.rb

@@ -1,4 +1,4 @@
-require_relative 'info_plist_controller'
+require_relative 'project_controller'
 require 'fastlane_core/ui/ui'
 
 module FastlaneCraft
@@ -12,16 +12,15 @@ module FastlaneCraft
     include FastlaneCore
     include Gem
 
-    def initialize(scheme, info_plist, extra_info_plists, branch, version = nil, target_suffix = nil)
-      raise 'Invalid Branch' if branch.empty?
-      raise 'Invalid Scheme' if scheme.empty?
+    def initialize(schemes, project, branch, version = nil, build_version = nil, target_suffix = nil)
       raise 'Invalid Version' if version && !version_valid?(version)
 
-      @scheme = scheme
+      @scheme = schemes.first
       @branch = branch
       @target_suffix = target_suffix
-      @plist_controller = InfoPlistController.new(info_plist, extra_info_plists)
-      @version = version.nil? ? @plist_controller.version : Version.new(version)
+      @project_controller = ProjectController.new(project, schemes)
+      @version = version.nil? ? @project_controller.version : Version.new(version)
+      @build_version = build_version
     end
 
     def release
@@ -29,7 +28,8 @@ module FastlaneCraft
       archive
       upload_to_tf
       update_env
-      @plist_controller.bump_build_version_patch
+
+      build_version.nil? @project_controller.bump_build_version_patch : @project_controller.set_build_version(build_version)
       push_version_bump
 
       remove_existing_git_tag
@@ -38,22 +38,24 @@ module FastlaneCraft
 
     def bump_version
       msg = 'Given version is less than the actual app version'
-      UI.user_error! msg if @version < @plist_controller.version
-      return unless @version > @plist_controller.version
+      UI.user_error! msg if @version < @project_controller.version
+      return unless @version > @project_controller.version
 
-      @plist_controller.set_version(@version)
-      @plist_controller.set_build_version(Version.new(@version.to_s + '.0'))
+      @project_controller.set_version(@version)
+      @project_controller.set_build_version(Version.new(@version.to_s + '.0'))
       UI.success "Version was successfully bumped to #{version_dump}"
     end
 
     def upload_to_tf
+      # see more at https://github.com/fastlane/fastlane/issues/15390
+      ENV["DELIVER_ITMSTRANSPORTER_ADDITIONAL_UPLOAD_PARAMETERS"] = "-t DAV"
       cmd = 'fastlane pilot upload --skip_submission --skip_waiting_for_build_processing'
       raise "TF uploading Failed! Command execution error: '#{cmd}'" unless system(cmd)
     end
 
     def update_env
-      ENV[SharedValues::APP_RELEASE_VERSION] = @plist_controller.version.to_s
-      ENV[SharedValues::APP_RELEASE_BUILD_NUMBER] = @plist_controller.build_version.to_s
+      ENV[SharedValues::APP_RELEASE_VERSION] = @project_controller.version.to_s
+      ENV[SharedValues::APP_RELEASE_BUILD_NUMBER] = @project_controller.build_version.to_s
       ENV[SharedValues::APP_RELEASE_VERSION_TAG] = version_dump
     end
 
@@ -110,7 +112,7 @@ module FastlaneCraft
     end
 
     def version_dump
-      "#{@plist_controller.version}/#{@plist_controller.build_version}"
+      "#{@project_controller.version}/#{@project_controller.build_version}"
     end
   end
 end

data/lib/fastlane-craft/project_controller.rb

@@ -0,0 +1,81 @@
+require 'xcodeproj'
+
+module FastlaneCraft
+  class ProjectController
+    include Gem
+
+    def initialize(path, schemes)
+      raise 'Invalid Path' unless File.directory?(path)
+      
+      @project = Xcodeproj::Project.open(path)
+      @schemes = schemes
+    end
+
+    def bump_build_version_patch
+      value = build_version.to_s
+      value[-1] = (value[-1].to_i + 1).to_s
+      set_build_version(Version.new(value))
+    end
+
+    def set_version(version)
+      @schemes.each do |s| 
+        set_scheme_value_for_key(s, version.to_s, version_key) 
+      end
+    end
+
+    def set_build_version(version)
+      @schemes.each do |s| 
+        set_scheme_value_for_key(s, version.to_s, build_version_key) 
+      end
+    end
+
+    def version
+      value = scheme_value_for_key(@schemes.first, version_key)
+      Version.new(value)
+    end
+
+    def build_version
+      value = scheme_value_for_key(@schemes.first, build_version_key)
+      Version.new(value)
+    end
+
+    private
+
+    def set_scheme_value_for_key(scheme, value, key, configuration = nil)
+      target = project_target(scheme)
+      target.build_configurations.each do |config|
+        if configuration.nil? || config.name == configuration
+          config.build_settings[key] = value
+        end
+      end
+      
+      @project.save()
+    end
+
+    def scheme_value_for_key(scheme, key, configuration = nil)
+      target = project_target(scheme)
+      target.build_configurations.each do |config|
+        if configuration.nil? || config.name == configuration
+          value = config.build_settings[key]
+          return value if value
+        end
+      end
+
+      return nil
+    end
+
+    def project_target(scheme)
+      target = @project.targets.find { |t| t.name == scheme } 
+      raise "Target not found for scheme: #{scheme}" unless target
+      return target
+    end
+
+    def version_key
+      'MARKETING_VERSION'
+    end
+    
+    def build_version_key
+      'CURRENT_PROJECT_VERSION'
+    end
+  end
+end

data/lib/fastlane-craft/upload_to_s3.rb

@@ -137,8 +137,8 @@ module Fastlane
       end
 
       def self.is_supported?(platform)
-        platform == :android || platform == :ios
+        %i[ios android].include?(platform)
       end
     end
   end
-  end
+end

data/lib/fastlane-craft/version.rb

@@ -1,3 +1,3 @@
 module FastlaneCraft
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.5.3'.freeze
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-craft
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.3
 platform: ruby
 authors:
 - sroik
 - elfenlaid
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2020-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -39,6 +39,20 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: xcodeproj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -132,7 +146,7 @@ files:
 - lib/fastlane-craft.rb
 - lib/fastlane-craft/app_release.rb
 - lib/fastlane-craft/app_release_manager.rb
-- lib/fastlane-craft/info_plist_controller.rb
+- lib/fastlane-craft/project_controller.rb
 - lib/fastlane-craft/telegram.rb
 - lib/fastlane-craft/telegram_notifier.rb
 - lib/fastlane-craft/upload_dsym.rb
@@ -142,7 +156,7 @@ homepage: https://github.com/app-craft/fastlane-craft.git
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -157,9 +171,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: fastlane craft summary
 test_files: []

data/lib/fastlane-craft/info_plist_controller.rb

@@ -1,67 +0,0 @@
-require 'plist'
-
-module FastlaneCraft
-  class InfoPlistController
-    include Gem
-
-    def initialize(info_plist, extra_info_plists = [])
-      raise 'Invalid Info Plist Path' unless File.file?(info_plist)
-      raise 'Invalid Extra Info Plists Paths' unless extra_info_plists.all? { |p| File.file?(p) }
-
-      @info_plist = info_plist
-      @extra_info_plists = extra_info_plists
-    end
-
-    def bump_build_version_patch
-      value = build_version.to_s
-      value[-1] = (value[-1].to_i + 1).to_s
-      set_build_version(Version.new(value))
-    end
-
-    def set_version(version)
-      info_plists.each do |path|
-        set_plist_value_for(path, version.to_s, version_key)
-      end
-    end
-
-    def set_build_version(version)
-      info_plists.each do |path|
-        set_plist_value_for(path, version.to_s, build_version_key)
-      end
-    end
-
-    def version
-      value = plist_value_for(@info_plist, version_key)
-      Version.new(value)
-    end
-
-    def build_version
-      value = plist_value_for(@info_plist, build_version_key)
-      Version.new(value)
-    end
-
-    private
-
-    def set_plist_value_for(plist_path, value, key)
-      plist = Plist.parse_xml(plist_path)
-      plist[key] = value
-      File.write(plist_path, Plist::Emit.dump(plist))
-    end
-
-    def plist_value_for(plist_path, key)
-      Plist.parse_xml(plist_path)[key]
-    end
-
-    def info_plists
-      [@info_plist] + @extra_info_plists
-    end
-
-    def version_key
-      'CFBundleShortVersionString'
-    end
-
-    def build_version_key
-      'CFBundleVersion'
-    end
-  end
-end