From 4e400c26646b44542371c01934fe813c09011fe5 Mon Sep 17 00:00:00 2001 From: Ivan Smolin Date: Tue, 20 Oct 2020 15:48:31 +0300 Subject: [PATCH 1/2] add SPM support --- .gitignore | 104 +++++++++++++++++++++++++++++++++++++++++--------- Package.swift | 29 ++++++++++++++ 2 files changed, 115 insertions(+), 18 deletions(-) create mode 100644 Package.swift diff --git a/.gitignore b/.gitignore index 93c86d3..6e6fd26 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,18 @@ -# OS X -.DS_Store - # Xcode +# +# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore + +## User settings +xcuserdata/ + +## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9) +*.xcscmblueprint +*.xccheckout + +## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4) build/ +DerivedData/ +*.moved-aside *.pbxuser !default.pbxuser *.mode1v3 @@ -11,27 +21,85 @@ build/ !default.mode2v3 *.perspectivev3 !default.perspectivev3 -xcuserdata/ -*.xccheckout -profile -*.moved-aside -DerivedData + +## Obj-C/Swift specific *.hmap + +## App packaging *.ipa +*.dSYM.zip +*.dSYM -# Bundler -.bundle +## Playgrounds +timeline.xctimeline +playground.xcworkspace -# Add this line if you want to avoid checking in source code from Carthage dependencies. -# Carthage/Checkouts +# Swift Package Manager +# +# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies. +# Packages/ +# Package.pins +# Package.resolved +# *.xcodeproj +# +# Xcode automatically generates this directory with a .xcworkspacedata file and xcuserdata +# hence it is not needed unless you have added a package configuration file to your project +# .swiftpm -Carthage/Build +.build/ +# CocoaPods +# # We recommend against adding the Pods directory to your .gitignore. However # you should judge for yourself, the pros and cons are mentioned at: -# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control -# -# Note: if you ignore the Pods directory, make sure to uncomment -# `pod install` in .travis.yml +# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control # -# Pods/ +Pods/ +# +# Add this line if you want to avoid checking in source code from the Xcode workspace +# *.xcworkspace + +# Carthage +# +# Add this line if you want to avoid checking in source code from Carthage dependencies. +Carthage/Checkouts + +Carthage/Build/ + +# Accio dependency management +Dependencies/ +.accio/ + +# fastlane +# +# It is recommended to not store the screenshots in the git repo. +# Instead, use fastlane to re-generate the screenshots whenever they are needed. +# For more information about the recommended setup visit: +# https://docs.fastlane.tools/best-practices/source-control/#source-control + +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots/**/*.png +fastlane/test_output + +# Code Injection +# +# After new code Injection tools there's a generated folder /iOSInjectionProject +# https://github.com/johnno1962/injectionforxcode + +iOSInjectionProject/ + +# homebrew-bundle +Brewfile.lock.json + +# Node.js +# Dependency directories +node_modules/ + +# Touch Instinct custom +Downloads/ +fastlane/README.md +Templates/ +cpd-output.xml +*.swp +*IDEWorkspaceChecks.plist diff --git a/Package.swift b/Package.swift new file mode 100644 index 0000000..b63d852 --- /dev/null +++ b/Package.swift @@ -0,0 +1,29 @@ +// swift-tools-version:5.3 +// The swift-tools-version declares the minimum version of Swift required to build this package. + +import PackageDescription + +let package = Package( + name: "TICoordinatorKit", + platforms: [ + .iOS(.v9), + .tvOS(.v9) + ], + products: [ + // Products define the executables and libraries a package produces, and make them visible to other packages. + .library( + name: "TICoordinatorKit", + targets: ["TICoordinatorKit"]), + ], + dependencies: [ + // Dependencies declare other packages that this package depends on. + // .package(url: /* package url */, from: "1.0.0"), + ], + targets: [ + // Targets are the basic building blocks of a package. A target can define a module or a test suite. + // Targets can depend on other targets in this package, and on products in packages this package depends on. + .target( + name: "TICoordinatorKit", + path: "TICoordinatorKit/Classes/"), + ] +) From 6e021bd825bb557a19735dbaf5e68ee8be9b1347 Mon Sep 17 00:00:00 2001 From: Ivan Smolin Date: Tue, 20 Oct 2020 15:58:59 +0300 Subject: [PATCH 2/2] fix review notes --- Package.swift | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Package.swift b/Package.swift index b63d852..1cd39bd 100644 --- a/Package.swift +++ b/Package.swift @@ -10,18 +10,11 @@ let package = Package( .tvOS(.v9) ], products: [ - // Products define the executables and libraries a package produces, and make them visible to other packages. .library( name: "TICoordinatorKit", targets: ["TICoordinatorKit"]), ], - dependencies: [ - // Dependencies declare other packages that this package depends on. - // .package(url: /* package url */, from: "1.0.0"), - ], targets: [ - // Targets are the basic building blocks of a package. A target can define a module or a test suite. - // Targets can depend on other targets in this package, and on products in packages this package depends on. .target( name: "TICoordinatorKit", path: "TICoordinatorKit/Classes/"),