fastlane-plugin-mobile_tools 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd0dd7ecb991b2905afdb6368415ec3004ff7f9aa528c7403fed5f888020eba3
-  data.tar.gz: 6f4a29739024b2b4ced1c8f68bba1cf98cd2b6261db93c423efdc07cb112f5a2
+  metadata.gz: 8b8d5653d4f3f3b10d79db61208cd9f31b0fd9a30bd048303897e246d349120b
+  data.tar.gz: ece53b29c54071b28807c757c0c1157ae53846e09463e719b1c2ec3d4ee9b7d8
 SHA512:
-  metadata.gz: 9246660088cf1d2290822fdadd357700bd17d1873ca6b1e87cda1b7c1a2663729d5ab3d16070d02e9122b8678da57798380cf97b4aa256677cb73c9808fb7e05
-  data.tar.gz: 31af1947838a34a35fa99ebfdc68beef61143db978fc41214cf34a5ece42e479851438caff500c3a0116e2eeb3483a154ad97cd5b03a9102cd0160fb234c9630
+  metadata.gz: 0a6d6a9d84e45d400121a5bb9fa9b4c99bffa221656fce87c80813db1acfdff46edc589139afe1e02289156fbfb9677aecba7580416dff37e5c8c285b9e023a9
+  data.tar.gz: c0bb6fb42a97af43acdb7c2a6e39e2fa3edea90737fa0b4520b4fb395d0b2364fb87adb5f9fc59c117140b213d2db884afb93d186957b435ffbba23f403ddf4b

data/lib/fastlane/plugin/mobile_tools/actions/create_xcframework_action.rb

@@ -26,6 +26,7 @@ module Fastlane
           end
 
           create_xcframework(params)
+          
           remove_module_reference(params)
           sign_xcframework(params)
           zip_xcframework(params)
@@ -114,7 +115,7 @@ module Fastlane
       end
 
       def self.sign_xcframework(params)
-        return if params[:code_sign_identity].nil?
+        return if params[:code_sign_identity].nil? || params[:code_sign_identity] == false
       
         frameworks = params[:frameworks] || [nil]
       
@@ -132,8 +133,9 @@ module Fastlane
         end
       end
 
+      require 'tmpdir'
       def self.zip_xcframework(params)
-        return if params[:zip_xcframework].nil?
+        return if params[:zip_xcframework].nil? || params[:zip_xcframework] == false
 
         # Check if the zip utility is installed
         unless system("which zip > /dev/null 2>&1")
@@ -143,26 +145,57 @@ module Fastlane
 
         frameworks = params[:frameworks] || [nil]
 
-        frameworks.each do |framework|
-          xcframework = framework ? @xchelper.get_xcframework_path(framework) : @xchelper.xcframework_path
-          UI.message("▸ Zipping xcframework at path: #{xcframework}")
+        if params[:combine_all_zip]
+          Dir.mktmpdir do |tmpdir|
+            frameworks.each do |framework|
+              xcframework = framework ? @xchelper.get_xcframework_path(framework) : @xchelper.xcframework_path
+              UI.message("▸ Copying xcframework at path: #{xcframework} to tmp directory")
+              FileUtils.cp_r(xcframework, tmpdir)
+            end
+        
+            combined_zip_path = File.join(tmpdir, 'combined_xcframeworks.zip')
+            UI.message("▸ Listing all files in tmp directory")
+            UI.message(Dir.entries(tmpdir))
+        
+            Dir.chdir(tmpdir) do
+              command = "zip -r -X #{combined_zip_path} ."
+              UI.message("▸ Zipping all xcframeworks into one zip at path: #{combined_zip_path}")
+              UI.message(command)
+        
+              begin
+                Actions.sh(command)
+              rescue StandardError => e
+                UI.user_error!(e)
+              end
+            end
+        
+            output_directory = params[:output_directory] || '.'
+            final_zip_path = File.join(output_directory, 'combined_xcframeworks.zip')
+            FileUtils.mv(combined_zip_path, final_zip_path)
+            UI.message("▸ Moved combined zip to output directory at path: #{final_zip_path}")
+          end
+        else
+          frameworks.each do |framework|
+            xcframework = framework ? @xchelper.get_xcframework_path(framework) : @xchelper.xcframework_path
 
-          begin
-            zip_path = "#{xcframework}.zip"
-            FileUtils.rm_f(zip_path) if File.exist?(zip_path)
+            UI.message("▸ Zipping xcframework at path: #{xcframework}")
+            begin
+              zip_path = "#{xcframework}.zip"
+              FileUtils.rm_f(zip_path) if File.exist?(zip_path)
 
-            command = "zip -r -X #{zip_path} #{xcframework}"
-            UI.message(command)
+              command = "zip -r -X #{zip_path} #{xcframework}"
+              UI.message(command)
 
-            Actions.sh(command)
-          rescue StandardError => e
-            UI.user_error!(e)
+              Actions.sh(command)
+            rescue StandardError => e
+              UI.user_error!(e)
+            end
           end
         end
       end
 
       def self.delete_xcframework(params)
-        return if params[:delete_xcframework].nil?
+        return if params[:delete_xcframework].nil? || params[:delete_xcframework] == false
 
         frameworks = params[:frameworks] || [nil]
 
@@ -178,13 +211,11 @@ module Fastlane
         end
       end
 
-
-
       # #Fix compile problem go to xcframework and run this command (https://developer.apple.com/forums/thread/123253):
       # #The generated file includes many module references that Swift thinks are class references because it uses the class ahead of the module
       # #The problem is that in the Swiftinterface file, we have a class named ABCConnections, but the module is also called ABCConnections. 
       def self.remove_module_reference(params)
-        return if params[:ignore_module_reference].nil?
+        return if params[:ignore_module_reference].nil? || params[:ignore_module_reference] == false
       
         frameworks = params[:frameworks] || [nil]
       
@@ -355,7 +386,7 @@ module Fastlane
       end
 
       def self.authors
-        ['Boris Bielik', 'Alexey Alter-Pesotskiy']
+        ['ykhandelwal']
       end
 
       def self.details
@@ -458,8 +489,15 @@ module Fastlane
             description: 'Delete the xcframework after creation',
             optional: true,
             default_value: false
+          ),
+          FastlaneCore::ConfigItem.new(
+            key: :combine_all_zip,
+            description: 'Combine all xcframeworks into one zip file',
+            optional: true,
+            default_value: false
           )
         ]
+        
       end
 
       def self.category

data/lib/fastlane/plugin/mobile_tools/actions/validate_xcframework_action.rb

@@ -0,0 +1,105 @@
+module Fastlane
+    module Actions
+      class ValidateXcframeworkAction < Action
+        def self.run(params)
+          validate_xcframework(params)
+        end
+  
+        def self.validate_xcframework(params)
+          return if params[:validate_xcframework].nil? || params[:validate_xcframework] == false
+  
+          UI.message("▸ Validating xcframework")
+          xcframework_paths = []
+  
+          frameworks = params[:frameworks] || [nil]
+            
+          @xchelper = Helper::CreateXcframeworkHelper.new(params)
+          frameworks.each do |framework|
+            xcframework = framework ? @xchelper.get_xcframework_path(framework) : @xchelper.xcframework_path
+            xcframework_paths << xcframework
+          end
+          
+          UI.message("▸ Creating temporary sample app")
+          sample_app_path = Helper::ValidateXcframeworkHelper.create_sample_app(xcframework_paths)
+  
+          UI.message("▸ Building the sample app to validate xcframework")
+          begin
+            Dir.chdir(sample_app_path) do
+              Actions.sh("swift build")
+              UI.success("xcframework validation succeeded")
+            end
+          rescue StandardError => e
+            UI.user_error!("xcframework validation failed: #{e}")
+          end
+  
+          UI.message("▸ Creating project.yml for xcodegen")
+          project_yml_path = Helper::ValidateXcframeworkHelper.create_project_yml(xcframework_paths, sample_app_path)
+  
+          UI.message("▸ Generating Xcode project using xcodegen")
+          begin
+            Helper::ValidateXcframeworkHelper.generate_xcode_project(project_yml_path)
+            UI.success("Xcode project generated successfully with xcodegen")
+          rescue StandardError => e
+            UI.user_error!("Failed to generate Xcode project with xcodegen: #{e}")
+          end
+  
+          UI.message("▸ Building the Xcode project to validate xcframework")
+          xcodeproj_path = File.join(sample_app_path, 'SampleApp.xcodeproj')
+          begin
+            Helper::ValidateXcframeworkHelper.build_xcode_project(xcodeproj_path)
+            UI.success("xcframework validation succeeded with xcodebuild")
+          rescue StandardError => e
+            UI.user_error!("xcframework validation failed with xcodebuild: #{e}")
+          end
+        end
+  
+        def self.run_swiftlint
+          UI.message("▸ Running SwiftLint")
+          begin
+            Actions.sh("if which swiftlint >/dev/null; then swiftlint; else echo 'warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint'; fi")
+            UI.success("SwiftLint check completed successfully")
+          rescue StandardError => e
+            UI.user_error!("SwiftLint check failed: #{e}")
+          end
+        end
+  
+        def self.description
+          "Validate xcframework and run SwiftLint"
+        end
+  
+        def self.authors
+          ["Your Name"]
+        end
+  
+        def self.return_value
+          # If your method provides a return value, you can describe it here
+        end
+  
+        def self.details
+          # Optional:
+          "This action validates an xcframework by creating a temporary sample app, building it, and running SwiftLint."
+        end
+  
+        def self.available_options
+          [
+            FastlaneCore::ConfigItem.new(key: :frameworks,
+                                         description: "Paths to the frameworks to be validated",
+                                         optional: false,
+                                         type: Array),
+            FastlaneCore::ConfigItem.new(key: :validate_xcframework,
+                                         description: "Flag to validate xcframework",
+                                         optional: true,
+                                         type: Boolean),
+            FastlaneCore::ConfigItem.new(key: :xcframework_output_directory,
+                                        description: "Output directory for the xcframework",
+                                        optional: true,
+                                        type: String)
+          ]
+        end
+  
+        def self.is_supported?(platform)
+          true
+        end
+      end
+    end
+  end

data/lib/fastlane/plugin/mobile_tools/helper/validate_xcframework_helper.rb

@@ -0,0 +1,142 @@
+module Fastlane
+    module Helper
+      class ValidateXcframeworkHelper
+        def self.create_sample_app(framework_paths)
+          tmpdir = Dir.mktmpdir
+          sample_app_path = File.join(tmpdir, 'SampleApp')
+          Dir.mkdir(sample_app_path)
+          Dir.chdir(sample_app_path) do
+            system("swift package init --type executable")
+            tests_path = File.join(sample_app_path, 'Tests', 'SampleAppTests')
+            FileUtils.mkdir_p(tests_path)
+  
+            # Copy frameworks to the temporary sample app folder
+            framework_paths.each do |path|
+              FileUtils.cp_r(path, sample_app_path)
+            end
+  
+            package_swift_path = File.join(sample_app_path, 'Package.swift')
+            # Extract names from framework paths and ensure paths are relative
+            binary_targets = framework_paths.map do |path|
+              name = File.basename(path, ".framework")
+              relative_path = "./" + File.basename(path)
+              ".binaryTarget(name: \"#{name}\", path: \"#{relative_path}\")"
+            end.join(",\n        ")
+  
+            # Create dependencies for SampleApp target
+            dependencies = framework_paths.map do |path|
+              name = File.basename(path, ".framework")
+              "\"#{name}\""
+            end.join(", ")
+  
+            resources = framework_paths.map do |path|
+              name = File.basename(path, ".framework")
+              ".copy(\"./#{name}.framework\")"
+            end.join(",\n                      ")
+  
+            # Add all framework names to the products target
+            product_targets = framework_paths.map do |path|
+              name = File.basename(path, ".framework")
+              "\"#{name}\""
+            end.join(", ")
+  
+            package_swift_content = <<-SWIFT
+            // swift-tools-version:5.3
+            import PackageDescription
+  
+            let package = Package(
+                name: "SampleApp",
+                platforms: [
+                    .macOS(.v10_15),
+                    .iOS(.v13)
+                ],
+                products: [
+                    .executable(name: "SampleApp", targets: ["SampleApp", #{product_targets}]),
+                ],
+                dependencies: [
+                    // Add dependencies here
+                ],
+                targets: [
+                    #{binary_targets},
+                    .target(
+                        name: "SampleApp",
+                        dependencies: [#{dependencies}],
+                        path: "Sources",
+                        resources: [
+                            #{resources}
+                        ]
+                    ),
+                    .testTarget(
+                        name: "SampleAppTests",
+                        dependencies: ["SampleApp"],
+                        path: "Tests/SampleAppTests"
+                    ),
+                ]
+            )
+            SWIFT
+  
+            File.write(package_swift_path, package_swift_content.strip)
+          end
+          sample_app_path
+        end
+  
+        def self.create_project_yml(framework_paths, sample_app_path)
+          project_yml_content = {
+            "name" => "SampleApp",
+            "options" => {
+              "bundleIdPrefix" => "com.intuit"
+            },
+            "targets" => {
+              "SampleApp" => {
+                "type" => "application",
+                "platform" => "iOS",
+                "deploymentTarget" => "13.0",
+                "sources" => ["Sources"],
+                "resources" => framework_paths.map { |path| "./#{File.basename(path)}" },
+                "dependencies" => framework_paths.map { |path| { "framework" => "./#{File.basename(path)}", "embed" => true } },
+                "settings" => {
+                  "base" => {
+                    "DEVELOPMENT_TEAM" => "F6DWWXWEX6",
+                    "GENERATE_INFOPLIST_FILE" => "YES",
+                    "CODE_SIGN_IDENTITY" => "iPhone Developer",
+                    "LD_RUNPATH_SEARCH_PATHS" => ["$(inherited)", "@executable_path/Frameworks"],
+                    "SDKROOT" => "iphoneos",
+                    "TARGETED_DEVICE_FAMILY" => "1,2",
+                    "VERSIONING_SYSTEM" => "apple-generic",
+                    "CURRENT_PROJECT_VERSION" => "1",
+                    "MARKETING_VERSION" => "1.0",
+                    "CFBundleVersion" => "$(CURRENT_PROJECT_VERSION)",
+                    "CFBundleShortVersionString" => "$(MARKETING_VERSION)"
+                  },
+                  "configs" => {
+                    "debug" => {
+                      "CODE_SIGN_STYLE" => "Manual",
+                      "PROVISIONING_PROFILE_SPECIFIER" => "com.intuit.*.InHouse",
+                      "CODE_SIGN_IDENTITY" => "iPhone Distribution: Intuit Inc.(Ent)"
+                    },
+                    "release" => {
+                      "CODE_SIGN_STYLE" => "Manual",
+                      "PROVISIONING_PROFILE_SPECIFIER" => "com.intuit.*.InHouse",
+                      "CODE_SIGN_IDENTITY" => "iPhone Distribution: Intuit Inc.(Ent)"
+                    }
+                  }
+                }
+              }
+            }
+          }
+  
+          project_yml_path = File.join(sample_app_path, 'project.yml')
+          File.write(project_yml_path, project_yml_content.to_yaml)
+          project_yml_path
+        end
+  
+        def self.generate_xcode_project(project_yml_path)
+          Actions.sh("xcodegen generate --spec #{project_yml_path}")
+        end
+  
+        def self.build_xcode_project(xcodeproj_path)
+          Actions.sh("xcodebuild -project #{xcodeproj_path} -scheme SampleApp -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14' build")
+        end
+      end
+    end
+  end

data/lib/fastlane/plugin/mobile_tools/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module MobileTools
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-mobile_tools
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Yogesh Khandelwal
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-16 00:00:00.000000000 Z
+date: 2024-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -192,7 +192,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: 
 email: yogesh_khandelwal@intuit.com
 executables: []
 extensions: []
@@ -202,13 +202,15 @@ files:
 - README.md
 - lib/fastlane/plugin/mobile_tools.rb
 - lib/fastlane/plugin/mobile_tools/actions/create_xcframework_action.rb
+- lib/fastlane/plugin/mobile_tools/actions/validate_xcframework_action.rb
 - lib/fastlane/plugin/mobile_tools/helper/create_xcframework_helper.rb
+- lib/fastlane/plugin/mobile_tools/helper/validate_xcframework_helper.rb
 - lib/fastlane/plugin/mobile_tools/version.rb
 homepage: https://github.com/ykhandelwal913/fastlane-plugin-mobile_tools
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -223,8 +225,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.2.3
+signing_key: 
 specification_version: 4
 summary: fastlane plugin for mobile devops tooling
 test_files: []