Merge pull request #6 from sergeykhliustin/develop

Drop --extra-sdk support

Makefile

@@ -8,7 +8,16 @@ integration-generate:
  bazel run :Generator -- "Pods/Pods.json" --src "$(shell pwd)/IntegrationTests" --deps-prefix "//IntegrationTests/Pods" --pods-root "IntegrationTests/Pods" -a -c
 
 integration-generate-dynamic:
- bazel run :Generator -- "Pods/Pods.json" --src "$(shell pwd)/IntegrationTests" --deps-prefix "//IntegrationTests/Pods" --pods-root "IntegrationTests/Pods" -a -c -f --extra-sdk CoreGraphics CoreImage StoreKit QuartzCore WebKit Accelerate
+ bazel run :Generator -- "Pods/Pods.json" \
+ --src "$(shell pwd)/IntegrationTests" \
+ --deps-prefix "//IntegrationTests/Pods" \
+ --pods-root "IntegrationTests/Pods" -a -c -f \
+ --user-options \
+ "Bolts.sdk_frameworks += CoreGraphics, WebKit" \
+ "SDWebImage.sdk_frameworks += CoreGraphics, CoreImage, QuartzCore, Accelerate" \
+ "CocoaLumberjack.sdk_frameworks += CoreGraphics" \
+ "FBSDKCoreKit.sdk_frameworks += StoreKit"
+
 
 integration-build:
  bazel build //IntegrationTests:TestApp_iOS --apple_platform_type=ios --ios_minimum_os=13.4 --ios_simulator_device="iPhone 8" --ios_multi_cpus=x86_64
@@ -24,7 +33,9 @@ integration-static: integration-clean integration-setup integration-generate int
 
 integration-dynamic: integration-clean integration-setup integration-generate-dynamic integration-build
 
-integration: integration-static integration-dynamic
+integration: 
+ $(MAKE) integration-static
+ $(MAKE) integration-dynamic
 
 clean:
  bazel clean

README.md

@@ -86,7 +86,7 @@ Enjoy :)
 
 ### Generator options
 ```
-USAGE: Generator <pods-json> --src <src> [--min-ios <min-ios>] [--deps-prefix <deps-prefix>] [--pods-root <pods-root>] [--extra-sdk <extra-sdk> ...] [--frameworks] [--concurrent] [--print-output] [--debug] [--add-podspec] [--user-options <user-options> ...]
+USAGE: Generator <pods-json> --src <src> [--min-ios <min-ios>] [--deps-prefix <deps-prefix>] [--pods-root <pods-root>] [--frameworks] [--concurrent] [--print-output] [--debug] [--add-podspec] [--user-options <user-options> ...]
 
 ARGUMENTS:
  <pods-json> Pods.json
@@ -97,7 +97,6 @@ OPTIONS:
  --deps-prefix <deps-prefix>
  Dependencies prefix (default: //Pods)
  --pods-root <pods-root> Pods root relative to workspace. Used for headers search paths (default: Pods)
- --extra-sdk <extra-sdk> Extra sdk frameworks for all targets
  -f, --frameworks Packaging pods in dynamic frameworks if possible (same as `use_frameworks!`)
  -c, --concurrent Concurrent mode for generating files faster
  --print-output Print BUILD files contents to terminal output
@@ -109,7 +108,7 @@ OPTIONS:
 ```
 ### Compiler
 ```
-USAGE: Compiler <podspec-json> [--src <src>] [--subspecs <subspecs> ...] [--min-ios <min-ios>] [--deps-prefix <deps-prefix>] [--pods-root <pods-root>] [--frameworks] [--extra-sdk <extra-sdk> ...] [--user-options <user-options> ...]
+USAGE: Compiler <podspec-json> [--src <src>] [--subspecs <subspecs> ...] [--min-ios <min-ios>] [--deps-prefix <deps-prefix>] [--pods-root <pods-root>] [--frameworks] [--user-options <user-options> ...]
 
 ARGUMENTS:
  <podspec-json> podspec.json
@@ -122,7 +121,6 @@ OPTIONS:
  Dependencies prefix (default: //Pods)
  --pods-root <pods-root> Pods root relative to workspace. Used for headers search paths (default: Pods)
  -f, --frameworks Packaging pods in dynamic frameworks if possible (same as `use_frameworks!`)
- --extra-sdk <extra-sdk> Extra sdk frameworks for all targets
  --user-options <user-options>
  User extra options. Current supported fields are 'sdk_dylibs', 'sdk_frameworks', 'weak_sdk_frameworks'. Format 'SomePod.sdk_dylibs+=something'
  -h, --help Show help information.

Sources/Compiler/RootCommand.swift

@@ -33,9 +33,6 @@ struct RootCommand: ParsableCommand {
  @Flag(name: .shortAndLong, help: "Packaging pods in dynamic frameworks if possible (same as `use_frameworks!`)")
  var frameworks: Bool = false
 
- @Option(name: .long, parsing: .upToNextOption, help: "Extra sdk frameworks for all targets")
- var extraSDK: [String] = []
-
  @Option(name: .long, parsing: .upToNextOption, help: "User extra options. Current supported fields are 'sdk_dylibs', 'sdk_frameworks', 'weak_sdk_frameworks'. Format 'SomePod.sdk_dylibs+=something'")
  var userOptions: [String] = []
 
@@ -59,7 +56,6 @@ struct RootCommand: ParsableCommand {
  iosPlatform: minIos,
  depsPrefix: depsPrefix,
  podsRoot: podsRoot,
- extraSDKFrameworks: extraSDK,
  dynamicFrameworks: frameworks)
 
  let result = PodBuildFile.with(podSpec: podSpec, buildOptions: options).compile()

Sources/Generator/RootCommand.swift

@@ -35,9 +35,6 @@ struct RootCommand: ParsableCommand {
  @Option(name: .long, help: "Pods root relative to workspace. Used for headers search paths")
  var podsRoot: String = "Pods"
 
- @Option(name: .long, parsing: .upToNextOption, help: "Extra sdk frameworks for all targets")
- var extraSDK: [String] = []
-
  @Flag(name: .shortAndLong, help: "Packaging pods in dynamic frameworks if possible (same as `use_frameworks!`)")
  var frameworks: Bool = false
 
@@ -95,7 +92,6 @@ struct RootCommand: ParsableCommand {
  iosPlatform: minIos,
  depsPrefix: depsPrefix,
  podsRoot: podsRoot,
- extraSDKFrameworks: extraSDK,
  dynamicFrameworks: frameworks)
  let starlarkString = PodBuildFile
  .with(podSpec: podSpec, buildOptions: buildOptions)

Sources/PodToBUILD/BuildOptions.swift

@@ -17,7 +17,6 @@ public protocol BuildOptions {
 
  var depsPrefix: String { get }
  var podsRoot: String { get }
- var extraSDKFrameworks: [String] { get }
 
  var dynamicFrameworks: Bool { get }
 
@@ -42,7 +41,6 @@ public struct BasicBuildOptions: BuildOptions {
  public let iosPlatform: String
  public let depsPrefix: String
  public let podsRoot: String
- public let extraSDKFrameworks: [String]
  public let dynamicFrameworks: Bool
 
  public init(podName: String = "",
@@ -54,7 +52,6 @@ public struct BasicBuildOptions: BuildOptions {
  iosPlatform: String = "13.0",
  depsPrefix: String = "//Pods",
  podsRoot: String = "Pods",
- extraSDKFrameworks: [String] = [],
  dynamicFrameworks: Bool = false) {
  self.podName = podName
  self.subspecs = subspecs
@@ -66,7 +63,6 @@ public struct BasicBuildOptions: BuildOptions {
  self.depsPrefix = depsPrefix
  self.podsRoot = podsRoot
  self.dynamicFrameworks = dynamicFrameworks
- self.extraSDKFrameworks = extraSDKFrameworks
  }
 
  public static let empty = BasicBuildOptions(podName: "")

Sources/PodToBUILD/Targets/AppleFramework.swift

@@ -127,7 +127,7 @@ struct AppleFramework: BazelTarget, UserConfigurable {
 
  sdkDylibs = spec.collectAttribute(with: subspecs, keyPath: \.libraries)
  sdkFrameworks = spec
- .collectAttribute(with: subspecs, keyPath: \.frameworks) <> AttrSet(basic: Set(options.extraSDKFrameworks))
+ .collectAttribute(with: subspecs, keyPath: \.frameworks)
  .unpackToMulti()
  weakSdkFrameworks = spec.collectAttribute(with: subspecs, keyPath: \.weakFrameworks)