Skip to content

Commit a524a02

Browse files
committed
Update project structure. Merge framework and example project into a workspace.
1 parent 3d1c9ff commit a524a02

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+549
-1589
lines changed

.travis.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,33 @@ env:
44
global:
55
- LC_CTYPE=en_US.UTF-8
66
- LANG=en_US.UTF-8
7-
- WORKSPACE="iOS Example.xcworkspace"
8-
- FRAMEWORK_PROJECT="PlaceholderUITextView.xcodeproj"
7+
- WORKSPACE=PlaceholderUITextView.xcworkspace
98
- FRAMEWORK_SCHEME="PlaceholderUITextView"
109
- EXAMPLE_SCHEME="iOS Example"
1110
matrix:
12-
- DESTINATION="OS=12.0,name=iPhone XR" PROJECT="$FRAMEWORK_PROJECT" BUILD_EXAMPLE="YES" POD_LINT="YES"
13-
- DESTINATION="OS=12.0,name=iPhone X" PROJECT="$FRAMEWORK_PROJECT" BUILD_EXAMPLE="YES" POD_LINT="NO"
11+
- DESTINATION="OS=12.0,name=iPhone 8" SCHEME="$FRAMEWORK_SCHEME" BUILD_EXAMPLE="YES" POD_LINT="YES"
12+
- DESTINATION="OS=12.0,name=iPhone XR" SCHEME="$FRAMEWORK_SCHEME" BUILD_EXAMPLE="YES" POD_LINT="NO"
13+
1414

1515
before_install:
1616
- gem install cocoapods --pre --no-rdoc --no-ri --no-document --quiet
17-
- cd Example && pod install
18-
- cd ..
19-
2017
script:
2118
- set -o pipefail
2219
- xcodebuild -version
2320
- xcodebuild -showsdks
2421

2522
# Build Framework in Debug
26-
- xcodebuild -project "$PROJECT" -scheme "$FRAMEWORK_SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty;
23+
- xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty;
2724

2825
# Build Framework in Release
29-
- xcodebuild -project "$PROJECT" -scheme "$FRAMEWORK_SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty;
26+
- xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" -configuration Release ONLY_ACTIVE_ARCH=NO build | xcpretty;
3027

3128
# Build Example in Debug if specified
32-
- cd Example
3329
- if [ $BUILD_EXAMPLE == "YES" ]; then
3430
xcodebuild -workspace "$WORKSPACE" -scheme "$EXAMPLE_SCHEME" -destination "$DESTINATION" -configuration Debug ONLY_ACTIVE_ARCH=NO build | xcpretty;
3531
fi
3632

3733
# Run `pod lib lint` if specified
38-
- cd ..
3934
- if [ $POD_LINT == "YES" ]; then
4035
pod lib lint;
4136
fi

Example/Podfile

Lines changed: 0 additions & 7 deletions
This file was deleted.

Example/Podfile.lock

Lines changed: 0 additions & 16 deletions
This file was deleted.

Example/Pods/Local Podspecs/BusinessCategory.podspec.json

Lines changed: 0 additions & 44 deletions
This file was deleted.

Example/Pods/Local Podspecs/PlaceholderUITextView.podspec.json

Lines changed: 0 additions & 27 deletions
This file was deleted.

Example/Pods/Manifest.lock

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)