Skip to content

Commit bb5f813

Browse files
authored
Remove xcodeproj. (#47)
* Remove Xcode project and convert to full SPM. * Update version number and changes for release 4.0.0-beta.1. * Dropping iOS 8.x support. * Add xcode project, workspace and vscode to gitignore.
1 parent 23afc73 commit bb5f813

File tree

104 files changed

+108
-8093
lines changed

Some content is hidden

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

104 files changed

+108
-8093
lines changed

.gitignore

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,23 @@ DerivedData
1616
*.hmap
1717
*.ipa
1818
*.xcuserstate
19+
*.xcodeproj
20+
*.xcworkspace
21+
22+
#
23+
# VS Code
24+
#
25+
.vscode
1926

2027
# CocoaPods
2128
#
2229
# We recommend against adding the Pods directory to your .gitignore. However
2330
# you should judge for yourself, the pros and cons are mentioned at:
2431
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
2532
#
26-
#Pods/
27-
#Podfile.lock
28-
#Manifest.lock
33+
Pods/
34+
Podfile.lock
35+
Manifest.lock
2936

3037
#####
3138
# OS X temporary files that should never be committed
@@ -62,4 +69,3 @@ vagrantfile
6269
# Note: we currently don't include the Gemfile lock because all we really care about is locking in the Cocoapods version
6370
#
6471
Gemfile*.lock
65-

.travis.yml

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ git:
55

66
env:
77
global:
8-
- WORKSPACE=Example/TraceLog.xcworkspace
8+
- PROJECT=TraceLog.xcodeproj
9+
- SCHEME=TraceLog-Package
910

1011
matrix:
1112
include:
@@ -32,7 +33,21 @@ matrix:
3233
- BUILD="xcodebuild"
3334
- TEST_DEST="platform=iOS Simulator,OS=11.3,name=iPhone 8"
3435
- TEST_SDK=iphonesimulator
35-
- SCHEME=TraceLog-iOS-Example
36+
-
37+
os: osx
38+
osx_image: xcode9.3
39+
env:
40+
- BUILD="xcodebuild"
41+
- TEST_DEST="platform=iOS Simulator,OS=10.3.1,name=iPhone 7"
42+
- TEST_SDK=iphonesimulator
43+
44+
-
45+
os: osx
46+
osx_image: xcode9.3
47+
env:
48+
- BUILD="xcodebuild"
49+
- TEST_DEST="platform=iOS Simulator,OS=9.3,name=iPhone 6s"
50+
- TEST_SDK=iphonesimulator
3651

3752
-
3853
os: osx
@@ -41,7 +56,6 @@ matrix:
4156
- BUILD="xcodebuild"
4257
- TEST_DEST="platform=OS X,arch=x86_64"
4358
- TEST_SDK=macosx
44-
- SCHEME=TraceLog-OSX-Example
4559

4660
before_install:
4761
#
@@ -53,6 +67,15 @@ before_install:
5367
gem install bundler
5468
bundler install
5569
fi
70+
#
71+
# OSX
72+
#
73+
- |
74+
if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
75+
# Fix travis issue: https://github.com/travis-ci/travis-ci/issues/6307
76+
rvm get head --auto-dotfiles || true
77+
sudo log config --subsystem "xctest" --mode "persist:debug"
78+
fi
5679
#
5780
# OSX
5881
#
@@ -61,8 +84,6 @@ before_install:
6184
# Fix travis issue: https://github.com/travis-ci/travis-ci/issues/6307
6285
rvm get head --auto-dotfiles || true
6386
sudo log config --subsystem "xctest" --mode "persist:debug"
64-
sudo log config --subsystem "TraceLog-OSX" --mode "persist:debug"
65-
sudo log config --subsystem "TraceLog-iOS" --mode "persist:debug"
6687
fi
6788
#
6889
# Linux requires downloading Swift and tools
@@ -82,20 +103,20 @@ before_install:
82103
script:
83104
- |
84105
if [[ "$BUILD" == "swift build" ]]; then
85-
swift test
106+
swift test
86107
fi
87108
- |
88109
if [[ "$BUILD" == "pod lint" ]]; then
89110
set -e # Fail (and stop build) on first non zero exit code
90-
bundler exec pod repo update
91111
bundler exec pod lib lint
92112
set +e
93113
fi
94114
- |
95115
if [[ "$BUILD" == "xcodebuild" ]]; then
96116
set -e # Fail (and stop build) on first non zero exit code
97-
xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$TEST_DEST" -sdk "$TEST_SDK" -enableCodeCoverage YES build-for-testing
98-
xcodebuild -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$TEST_DEST" -sdk "$TEST_SDK" -enableCodeCoverage YES test
117+
swift package generate-xcodeproj --xcconfig-overrides Package.xcconfig
118+
xcodebuild -project "$PROJECT" -scheme "$SCHEME" -destination "$TEST_DEST" -sdk "$TEST_SDK" -enableCodeCoverage YES build-for-testing
119+
xcodebuild -project "$PROJECT" -scheme "$SCHEME" -destination "$TEST_DEST" -sdk "$TEST_SDK" -enableCodeCoverage YES test
99120
set +e
100121
fi
101122

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
# Change Log
22
All significant changes to this project will be documented in this file.
33

4-
## [3.1.0](https://github.com/tonystone/tracelog/tree/3.1.0)
4+
## [4.0.0-beta.1](https://github.com/tonystone/tracelog/tree/4.0.0-beta.1)
55

66
#### Added
77
- `UnifiedLoggingWriter` for Apple Unified Logging system logging using TraceLog.
88

9+
#### Removed
10+
- Removed all Xcode projects, Xcode projects are now generated using Swift Package Manager.
11+
- Dropped iOS 8 support.
12+
913
## [3.0.0](https://github.com/tonystone/tracelog/tree/3.0.0)
1014

1115
#### Updated
File renamed without changes.

Example/Podfile

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

Example/Podfile.lock

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

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

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

Example/Pods/Manifest.lock

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

0 commit comments

Comments
 (0)