lib/command/config.rb in cocoapods-binary-cache-0.1.11 vs lib/command/config.rb in cocoapods-binary-cache-0.1.12
- old
+ new
@@ -56,11 +56,13 @@
def generated_frameworks_dir(in_cache: false)
root_dir(in_cache) + "/GeneratedFrameworks"
end
def prebuilt_path(path: nil)
- path.nil? ? "_Prebuilt" : "_Prebuilt/#{path}"
+ p = Pathname.new(path.nil? ? "_Prebuilt" : "_Prebuilt/#{path}")
+ p = p.sub_ext(".xcframework") if xcframework? && p.extname == ".framework"
+ p.to_s
end
def validate_dsl_config
inapplicable_options = @dsl_config.keys - applicable_dsl_config
return if inapplicable_options.empty?
@@ -101,19 +103,18 @@
def device_build_enabled?
@dsl_config[:device_build_enabled]
end
+ def xcframework?
+ @dsl_config[:xcframework]
+ end
+
def disable_dsym?
@dsl_config[:disable_dsym]
end
- def still_download_sources?(name)
- option = @dsl_config[:still_download_sources]
- option.is_a?(Array) ? option.include?(name) : option
- end
-
def dont_remove_source_code?
@dsl_config[:dont_remove_source_code]
end
def build_args
@@ -134,10 +135,14 @@
def strict_diagnosis?
@dsl_config[:strict_diagnosis]
end
+ def silent_build?
+ @dsl_config[:silent_build]
+ end
+
def targets_to_prebuild_from_cli
@cli_config[:prebuild_targets] || []
end
def update_detected_prebuilt_pod_names!(value)
@@ -168,17 +173,18 @@
:prebuild_all_pods,
:excluded_pods,
:dev_pods_enabled,
:bitcode_enabled,
:device_build_enabled,
+ :xcframework,
:disable_dsym,
- :still_download_sources,
:dont_remove_source_code,
:build_args,
:save_cache_validation_to,
:validate_prebuilt_settings,
:prebuild_code_gen,
- :strict_diagnosis
+ :strict_diagnosis,
+ :silent_build
]
end
def cache_repo_config
@cache_repo_config ||= begin