Skip to content

Commit

Permalink
Merge pull request 3lvis#135 from hyperoslo/migrate/datastack
Browse files Browse the repository at this point in the history
Migrate DATAStack 4.0.0
  • Loading branch information
3lvis committed Oct 25, 2015
2 parents d350f4e + 4dfa67e commit 6cfaccf
Show file tree
Hide file tree
Showing 127 changed files with 1,316 additions and 1,275 deletions.
16 changes: 11 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
# OS X
.DS_Store
.AppleDouble
.LSOverride
Icon
._*
.Spotlight-V100
.Trashes

# Xcode
#
build/
*.pbxuser
!default.pbxuser
Expand All @@ -13,14 +20,13 @@ build/
!default.perspectivev3
xcuserdata
*.xccheckout
*.xcuserstate
profile
*.moved-aside
DerivedData
*.hmap
*.ipa
*.gcno
*.gcda
Pods
*.xcuserstate
*.xcscmblueprint

# CocoaPods
Pods
*.lock
2 changes: 1 addition & 1 deletion .slather.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ci_service: travis_ci
coverage_service: coveralls
xcodeproj: Tests/Tests.xcodeproj
xcodeproj: Demo.xcodeproj
source_directory: Source
20 changes: 13 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
# osx_image: xcode7
# language: objective-c
# cache: cocoapods
# podfile: Tests/Podfile
# before_install: gem install cocoapods obcd slather -N
# script: xctool -workspace Tests/Tests.xcworkspace -scheme Tests -sdk iphonesimulator build test GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES clean test
# after_success: slather
osx_image: xcode7
language: objective-c
cache: cocoapods
before_install: gem install xcpretty cocoapods obcd slather -N

# Use when you don't have third party dependencies
script: xcodebuild -project Demo.xcodeproj -scheme Tests -sdk iphonesimulator build test GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES clean test | xcpretty -c && exit ${PIPESTATUS[0]}

# Use when you have third party dependencies (CocoaPods generates a workspace)
# podfile: Podfile
# script: xcodebuild -workspace Demo.xcworkspace -scheme Tests -sdk iphonesimulator build test GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES clean test | xcpretty -c && exit ${PIPESTATUS[0]}

after_success: slather
File renamed without changes.
27 changes: 27 additions & 0 deletions AppNet/Base.lproj/LaunchScreen.storyboard
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="Llm-lL-Icb"/>
<viewControllerLayoutGuide type="bottom" id="xb3-aO-Qok"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53" y="375"/>
</scene>
</scenes>
</document>
File renamed without changes.
File renamed without changes
File renamed without changes
4 changes: 2 additions & 2 deletions Examples/AppNet/AppNet/Info.plist → AppNet/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UIViewControllerBasedStatusBarAppearance</key>
<false/>
</dict>
</plist>
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import UIKit
import DATAStack
import CoreData

class ViewController: UITableViewController {
let CellIdentifier = "CellID"
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Check https://github.com/hyperoslo/Sync/releases for more information.
6 changes: 2 additions & 4 deletions CONTRIBUTING.md
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
GitHub Issues is for reporting bugs, discussing features and general feedback for **Sync**. Be sure to check our [documentation](http://cocoadocs.org/docsets/Sync), [FAQ](https://github.com/hyperoslo/Sync/wiki/FAQ) and [past issues](https://github.com/hyperoslo/Sync/issues?state=closed) before opening any new issues.
GitHub Issues is for reporting bugs, discussing features and general feedback in **Sync**. Be sure to check our [documentation](http://cocoadocs.org/docsets/Sync), [FAQ](https://github.com/hyperoslo/Sync/wiki/FAQ) and [past issues](https://github.com/hyperoslo/Sync/issues?state=closed) before opening any new issues.

If you are posting about a crash in your application or a feature request, an example of your **JSON** and your **Core Data model** or a **stacktrace** would be really helpful for us to be able to reproduce your issue or understand your request, please consider adding these things before making an issue.

Thanks <3
If you are posting about a crash in your application, a stack trace is helpful, but additional context, in the form of code and explanation, is necessary to be of any use.
Loading

0 comments on commit 6cfaccf

Please sign in to comment.