Skip to content

Commit 6712a91

Browse files
author
Evan Maloney
committed
updating generated files
1 parent 5c1a3ca commit 6712a91

File tree

4 files changed

+17
-46
lines changed

4 files changed

+17
-46
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,4 @@ after_failure:
3232
- test -f "CleanroomBridging-tvOS-test.log" && tail -n 2500 "CleanroomBridging-tvOS-test.log"
3333
- test -f "CleanroomBridging-tvOS-test.log" && LINE_BEFORE=`cat "CleanroomBridging-tvOS-test.log" | grep -n "IDETestOperationsObserverDebug. Writing diagnostic log for test session to." | awk -F':' '{print $1}'` && LINE=`expr $LINE_BEFORE + 1` && LOG_FILE=`head -n $LINE "CleanroomBridging-tvOS-test.log" | tail -n 1` && cat "$LOG_FILE"
3434
- test -f "CleanroomBridging-watchOS-build.log" && tail -n 2500 "CleanroomBridging-watchOS-build.log"
35+

BuildControl/repos.xml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -30,41 +30,15 @@
3030

3131
<Var name="branches" type="list">
3232
<Var literal="master"/>
33-
<Var literal="swift3"/>
3433
</Var>
3534

3635
<Var name="versions" type="map">
3736
<!-- master branch declarations -->
3837
<Var name="master" type="map">
39-
<Var name="Swift" literal="2.3"/>
40-
<Var name="Xcode" literal="8"/>
41-
42-
<Var name="Carthage" literal="0.17.2"/>
43-
44-
<Var name="current" type="map">
45-
<Var name="iOS" literal="10.0"/>
46-
<Var name="macOS" literal="10.12"/>
47-
<Var name="tvOS" literal="10.0"/>
48-
<Var name="watchOS" literal="3.0"/>
49-
</Var>
50-
51-
<Var name="minimum" type="map">
52-
<Var name="iOS" literal="8.0"/>
53-
<Var name="macOS" literal="10.10"/>
54-
<Var name="tvOS" literal="9.0"/>
55-
<Var name="watchOS" literal="2.0"/>
56-
</Var>
57-
</Var>
58-
59-
<!-- swift3 branch declarations -->
60-
<Var name="swift3" type="map">
61-
<Var name="note" literal="This branch is still under active development. Expect breaking changes to the API, the build system and/or the project structure at any time. **Be sure to lock against a specific commit if you simultaneously require Swift 3 and stability.**"/>
62-
6338
<Var name="Swift" literal="3.0"/>
6439
<Var name="Xcode" literal="8"/>
6540

6641
<Var name="Carthage" literal="0.17.2"/>
67-
<Var name="git" literal="2.7.4 (Apple Git-73)"/>
6842

6943
<Var name="current" type="map">
7044
<Var name="iOS" literal="10.0"/>

INTEGRATION.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![Gilt Tech logo](https://raw.githubusercontent.com/gilt/Cleanroom/swift3/Assets/gilt-tech-logo.png)
1+
![Gilt Tech logo](https://raw.githubusercontent.com/gilt/Cleanroom/master/Assets/gilt-tech-logo.png)
22

33
# CleanroomBridging Integration Notes
44

@@ -13,7 +13,7 @@ Macintosh|macOS 10.12|macOS 10.10
1313
Apple TV|tvOS 10.0|tvOS 9.0
1414
Apple Watch|watchOS 3.0|watchOS 2.0
1515

16-
**This is the `swift3` branch of CleanroomBridging.** It uses **Swift 3.0** and **requires Xcode 8** to compile.
16+
CleanroomBridging uses **Swift 3.0** and **requires Xcode 8** to compile.
1717

1818
### Options for integration
1919

@@ -36,12 +36,12 @@ Within to your project’s root directory, Carthage-based projects will store a
3636
To integrate CleanroomBridging in your workspace, you would start by adding the following line to the `Cartfile`:
3737

3838
```
39-
github "emaloney/CleanroomBridging" ~> 0.0.0
39+
github "emaloney/CleanroomBridging" ~> 1.0.0
4040
```
4141

42-
This specifies that Carthage use the latest version of CleanroomBridging that is API-compatible with 0.0, i.e. any 0.0.*x* version.
42+
This specifies that Carthage use the latest version of CleanroomBridging that is API-compatible with 1.0, i.e. any 1.0.*x* version.
4343

44-
**Note:** Be sure to check the [latest releases](https://github.com/emaloney/CleanroomBridging/releases); there may be a newer version than 0.0 that is no longer API-compatible.
44+
**Note:** Be sure to check the [latest releases](https://github.com/emaloney/CleanroomBridging/releases); there may be a newer version than 1.0 that is no longer API-compatible.
4545

4646
### 2. Download CleanroomBridging using Carthage
4747

@@ -106,7 +106,7 @@ Select the appropriate Build Scheme for your Target, and press `⌘-B` to try to
106106

107107
### You're done!
108108

109-
Once properly integrated, you can make use of [the API](https://rawgit.com/emaloney/CleanroomBridging/swift3/Documentation/API/index.html) provided by CleanroomBridging using the statement:
109+
Once properly integrated, you can make use of [the API](https://rawgit.com/emaloney/CleanroomBridging/master/Documentation/API/index.html) provided by CleanroomBridging using the statement:
110110

111111
```swift
112112
import CleanroomBridging
@@ -161,14 +161,14 @@ Select the appropriate Build Scheme for your Target, and press `⌘-B` to try to
161161

162162
### You're done!
163163

164-
Once properly integrated, you can make use of [the API](https://rawgit.com/emaloney/CleanroomBridging/swift3/Documentation/API/index.html) provided by CleanroomBridging using the statement:
164+
Once properly integrated, you can make use of [the API](https://rawgit.com/emaloney/CleanroomBridging/master/Documentation/API/index.html) provided by CleanroomBridging using the statement:
165165

166166
```swift
167167
import CleanroomBridging
168168
```
169169

170170
## Further Reading
171171

172-
Want to learn more about CleanroomBridging? Check out [the README](https://github.com/emaloney/CleanroomBridging/blob/swift3/README.md) or [the API documentation](https://rawgit.com/emaloney/CleanroomBridging/swift3/Documentation/API/index.html).
172+
Want to learn more about CleanroomBridging? Check out [the README](https://github.com/emaloney/CleanroomBridging/blob/master/README.md) or [the API documentation](https://rawgit.com/emaloney/CleanroomBridging/master/Documentation/API/index.html).
173173

174174
**_Happy coding!_**

README.md

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![Gilt Tech logo](https://raw.githubusercontent.com/gilt/Cleanroom/swift3/Assets/gilt-tech-logo.png)
1+
![Gilt Tech logo](https://raw.githubusercontent.com/gilt/Cleanroom/master/Assets/gilt-tech-logo.png)
22

33
# CleanroomBridging
44

@@ -9,23 +9,19 @@ CleanroomBridging is part of [the Cleanroom Project](https://github.com/gilt/Cle
99

1010
### Swift compatibility
1111

12-
**Important:** This is the `swift3` branch. It uses **Swift 3.0** and **requires Xcode 8** to compile.
12+
This is the `master` branch. It uses **Swift 3.0** and **requires Xcode 8** to compile.
1313

14-
This branch is still under active development. Expect breaking changes to the API, the build system and/or the project structure at any time. **Be sure to lock against a specific commit if you simultaneously require Swift 3 and stability.**
15-
16-
If you need Swift 2.3 compatibility, use the [`master`](https://github.com/emaloney/CleanroomBridging) branch, which requires Xcode 8.
1714

1815
#### Current status
1916

2017
Branch|Build status
2118
--------|------------------------
2219
[`master`](https://github.com/emaloney/CleanroomBridging)|[![Build status: master branch](https://travis-ci.org/emaloney/CleanroomBridging.svg?branch=master)](https://travis-ci.org/emaloney/CleanroomBridging)
23-
[`swift3`](https://github.com/emaloney/CleanroomBridging/tree/swift3)|[![Build status: swift3 branch](https://travis-ci.org/emaloney/CleanroomBridging.svg?branch=swift3)](https://travis-ci.org/emaloney/CleanroomBridging)
2420

2521

2622
### License
2723

28-
CleanroomBridging is distributed under [the MIT license](https://github.com/emaloney/CleanroomBridging/blob/swift3/LICENSE).
24+
CleanroomBridging is distributed under [the MIT license](https://github.com/emaloney/CleanroomBridging/blob/master/LICENSE).
2925

3026
CleanroomBridging is provided for your use—free-of-charge—on an as-is basis. We make no guarantees, promises or apologies. *Caveat developer.*
3127

@@ -39,20 +35,20 @@ The simplest way to integrate CleanroomBridging is with the [Carthage](https://g
3935
First, add this line to your [`Cartfile`](https://github.com/Carthage/Carthage/blob/master/Documentation/Artifacts.md#cartfile):
4036

4137
```
42-
github "emaloney/CleanroomBridging" ~> 0.0.0
38+
github "emaloney/CleanroomBridging" ~> 1.0.0
4339
```
4440

4541
Then, use the `carthage` command to [update your dependencies](https://github.com/Carthage/Carthage#upgrading-frameworks).
4642

47-
Finally, you’ll need to [integrate CleanroomBridging into your project](https://github.com/emaloney/CleanroomBridging/blob/swift3/INTEGRATION.md) in order to use [the API](https://rawgit.com/emaloney/CleanroomBridging/swift3/Documentation/API/index.html) it provides.
43+
Finally, you’ll need to [integrate CleanroomBridging into your project](https://github.com/emaloney/CleanroomBridging/blob/master/INTEGRATION.md) in order to use [the API](https://rawgit.com/emaloney/CleanroomBridging/master/Documentation/API/index.html) it provides.
4844

4945
Once successfully integrated, just add the following `import` statement to any Swift file where you want to use CleanroomBridging:
5046

5147
```swift
5248
import CleanroomBridging
5349
```
5450

55-
See [the Integration document](https://github.com/emaloney/CleanroomBridging/blob/swift3/INTEGRATION.md) for additional details on integrating CleanroomBridging into your project.
51+
See [the Integration document](https://github.com/emaloney/CleanroomBridging/blob/master/INTEGRATION.md) for additional details on integrating CleanroomBridging into your project.
5652

5753
## Using CleanroomBridging
5854

@@ -102,7 +98,7 @@ The example above sets up a timer that will result in the current time being pri
10298

10399
### API documentation
104100

105-
For detailed information on using CleanroomBridging, [API documentation](https://rawgit.com/emaloney/CleanroomBridging/swift3/Documentation/API/index.html) is available.
101+
For detailed information on using CleanroomBridging, [API documentation](https://rawgit.com/emaloney/CleanroomBridging/master/Documentation/API/index.html) is available.
106102

107103

108104
## About
@@ -125,5 +121,5 @@ If you’d like to contribute to this or any other Cleanroom Project repo, pleas
125121

126122
### Acknowledgements
127123

128-
[API documentation for CleanroomBridging](https://rawgit.com/emaloney/CleanroomBridging/swift3/Documentation/API/index.html) is generated using [Realm](http://realm.io)’s [jazzy](https://github.com/realm/jazzy/) project, maintained by [JP Simard](https://github.com/jpsim) and [Samuel E. Giddins](https://github.com/segiddins).
124+
[API documentation for CleanroomBridging](https://rawgit.com/emaloney/CleanroomBridging/master/Documentation/API/index.html) is generated using [Realm](http://realm.io)’s [jazzy](https://github.com/realm/jazzy/) project, maintained by [JP Simard](https://github.com/jpsim) and [Samuel E. Giddins](https://github.com/segiddins).
129125

0 commit comments

Comments
 (0)