Skip to content

Commit

Permalink
updating generated files
Browse files Browse the repository at this point in the history
  • Loading branch information
Evan Maloney committed Oct 18, 2016
1 parent 5c1a3ca commit 6712a91
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 46 deletions.
1 change: 1 addition & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,4 @@ after_failure:
- test -f "CleanroomBridging-tvOS-test.log" && tail -n 2500 "CleanroomBridging-tvOS-test.log"
- 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"
- test -f "CleanroomBridging-watchOS-build.log" && tail -n 2500 "CleanroomBridging-watchOS-build.log"

26 changes: 0 additions & 26 deletions BuildControl/repos.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,41 +30,15 @@

<Var name="branches" type="list">
<Var literal="master"/>
<Var literal="swift3"/>
</Var>

<Var name="versions" type="map">
<!-- master branch declarations -->
<Var name="master" type="map">
<Var name="Swift" literal="2.3"/>
<Var name="Xcode" literal="8"/>

<Var name="Carthage" literal="0.17.2"/>

<Var name="current" type="map">
<Var name="iOS" literal="10.0"/>
<Var name="macOS" literal="10.12"/>
<Var name="tvOS" literal="10.0"/>
<Var name="watchOS" literal="3.0"/>
</Var>

<Var name="minimum" type="map">
<Var name="iOS" literal="8.0"/>
<Var name="macOS" literal="10.10"/>
<Var name="tvOS" literal="9.0"/>
<Var name="watchOS" literal="2.0"/>
</Var>
</Var>

<!-- swift3 branch declarations -->
<Var name="swift3" type="map">
<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.**"/>

<Var name="Swift" literal="3.0"/>
<Var name="Xcode" literal="8"/>

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

<Var name="current" type="map">
<Var name="iOS" literal="10.0"/>
Expand Down
16 changes: 8 additions & 8 deletions INTEGRATION.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![Gilt Tech logo](https://raw.githubusercontent.com/gilt/Cleanroom/swift3/Assets/gilt-tech-logo.png)
![Gilt Tech logo](https://raw.githubusercontent.com/gilt/Cleanroom/master/Assets/gilt-tech-logo.png)

# CleanroomBridging Integration Notes

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

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

### Options for integration

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

```
github "emaloney/CleanroomBridging" ~> 0.0.0
github "emaloney/CleanroomBridging" ~> 1.0.0
```

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

**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.
**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.

### 2. Download CleanroomBridging using Carthage

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

### You're done!

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:
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:

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

### You're done!

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:
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:

```swift
import CleanroomBridging
```

## Further Reading

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).
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).

**_Happy coding!_**
20 changes: 8 additions & 12 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![Gilt Tech logo](https://raw.githubusercontent.com/gilt/Cleanroom/swift3/Assets/gilt-tech-logo.png)
![Gilt Tech logo](https://raw.githubusercontent.com/gilt/Cleanroom/master/Assets/gilt-tech-logo.png)

# CleanroomBridging

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

### Swift compatibility

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

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.**

If you need Swift 2.3 compatibility, use the [`master`](https://github.com/emaloney/CleanroomBridging) branch, which requires Xcode 8.

#### Current status

Branch|Build status
--------|------------------------
[`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)
[`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)


### License

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

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

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

```
github "emaloney/CleanroomBridging" ~> 0.0.0
github "emaloney/CleanroomBridging" ~> 1.0.0
```

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

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.
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.

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

```swift
import CleanroomBridging
```

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

## Using CleanroomBridging

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

### API documentation

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


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

### Acknowledgements

[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).
[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).

0 comments on commit 6712a91

Please sign in to comment.