Update Project Directories

.gitignore

@@ -51,14 +51,12 @@ playground.xcworkspace
 # you should judge for yourself, the pros and cons are mentioned at:
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
-# Pods/
+Pods
 
 Pods-*
 Local Podspecs
 Manifest.lock
 
-*/Pods/SwiftLint
-
 # Carthage
 #
 # Add this line if you want to avoid checking in source code from Carthage dependencies.

.jazzy.yml

@@ -3,7 +3,7 @@ author: Carousell
 author_url: https://github.com/carousell
 github_url: https://github.com/carousell/pickle
 github_file_prefix: https://github.com/carousell/pickle/blob/master
-xcodebuild_arguments: [-project, Example/Pods/Pods.xcodeproj, -scheme, Pickle]
+xcodebuild_arguments: [-project, Pickle.xcodeproj, -scheme, Pickle]
 module: Pickle
 module_version: 1.3.1
 output: docs/output

Example/.swiftlint.yml → .swiftlint.yml

@@ -7,6 +7,7 @@ identifier_name:
     - pi
     - to
 included:
-  - ../Pickle
+  - Example
+  - Pickle
 excluded:
   - Pods

.travis.yml

@@ -6,13 +6,13 @@ cache:
   cocoapods: true
   directories:
     - vendor/bundle
-    - Example/Pods/SwiftLint
+    - Pods
 before_install:
   - xcrun instruments -s devices
   - xcrun instruments -w "iPhone X (12.0) [" || true
 install:
   - bundle install --jobs=3 --retry=3 --deployment
-  - bundle exec pod install --project-directory=Example
+  - bundle exec pod install
   - sh scripts/install-carthage.sh 0.27.0
 before_script:
   - if [ -n "$DANGER_GITHUB_API_TOKEN" ]; then bundle exec danger; fi

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## v1.4.0
+
+* Swift 4.2
+* Move the framework and example targets into a single project
+
 ## v1.3.1
 
 * Update the project to Xcode 10 [#26](https://github.com/carousell/pickle/pull/26)

Dangerfile

@@ -31,13 +31,13 @@ if reviewer && !assigned
 end
 
 # Run swiftlint
-%x(echo "reporter: json" >> Example/.swiftlint.yml)
+%x(echo "reporter: json" >> .swiftlint.yml)
 
 pwd = Dir.pwd + "/"
-linter_json = %x(cd Example && #{pwd}Example/Pods/SwiftLint/swiftlint && cd --)
+linter_json = %x(#{pwd}/Pods/SwiftLint/swiftlint)
 results = JSON.parse linter_json
 
-%x(git checkout Example/.swiftlint.yml)
+%x(git checkout .swiftlint.yml)
 
 results.each do |violation|
   file = violation["file"].gsub(pwd, "")

Makefile

@@ -1,15 +1,12 @@
 bootstrap:
-	pod install --project-directory=Example && open Example/Pickle.xcworkspace
-
-pod-install:
-	pod install --project-directory=Example
+	pod install && open Pickle.xcworkspace
 
 build:
-	set -o pipefail && xcodebuild -workspace Example/Pickle.xcworkspace -scheme Pickle clean build | bundle exec xcpretty -c
+	set -o pipefail && xcodebuild -workspace Pickle.xcworkspace -scheme Pickle clean build | bundle exec xcpretty -c
 
 test:
 	set -o pipefail && xcodebuild \
-	-workspace Example/Pickle.xcworkspace \
+	-workspace Pickle.xcworkspace \
 	-scheme Pickle-Example \
 	-destination 'platform=iOS Simulator,name=iPhone X,OS=12.0' \
 	CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO \