Skip to content

Commit

Permalink
Merge pull request #93 from tonystone/release-4.0.0-beta.1
Browse files Browse the repository at this point in the history
Release 4.0.0 beta.1
  • Loading branch information
tonystone authored May 23, 2018
2 parents 5cbaf5d + a1c142c commit 21686bb
Show file tree
Hide file tree
Showing 31 changed files with 1,777 additions and 1,901 deletions.
1 change: 0 additions & 1 deletion .swift-version

This file was deleted.

18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,24 @@
# Change Log
All significant changes to this project will be documented in this file.

## [4.0.0-bweta.1](https://github.com/tonystone/coherence/releases/tag/4.0.0-beta.1)

#### Breaking Updates
- Renamed `PersistentStack` to `PersistentContainer`.
- Change `PersistentContainer` to @objc so you can now pass references to Objective-C.
- Changed `Connect` to @objc so you can now pass references to Objective-C.
- Split `Connect` protocol into `Connect` and `ActionManager` protocols.
- Changed `StoreConfiguration` to be a class instead of a struct to support Objective-C.
- Removed `ObjcPersistentContainer` as it's no longer needed with the new changes to the protocols.

#### Updated
- Changed `GenericConnect` to subclass `NSObject`.

## [3.2.0](https://github.com/tonystone/coherence/releases/tag/3.2.0)

#### Added
- Added the ability to supply an `AsyncErrorHandlerBlock` to `GenericConnect` init methods.

## [3.1.0](https://github.com/tonystone/coherence/releases/tag/3.1.0)

This is a minor release to update the Swift language to 4.1 and Xcode to 9.3.
Expand Down
4 changes: 3 additions & 1 deletion Coherence.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

Pod::Spec.new do |s|
s.name = "Coherence"
s.version = "3.1.0"
s.version = "4.0.0-beta.1"
s.summary = "Coherence"
s.description = <<-DESC
Coherence is a collection of base frameworks that help set the groundwork for module development.
Expand All @@ -19,6 +19,8 @@ Pod::Spec.new do |s|
s.author = "Tony Stone"
s.source = { :git => "https://github.com/tonystone/coherence.git", :tag => s.version.to_s }

s.swift_version = '4.0'

s.ios.deployment_target = '8.1'
s.osx.deployment_target = '10.10'
s.tvos.deployment_target = '9.0'
Expand Down
28 changes: 13 additions & 15 deletions Example/Coherence.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions Example/Coherence/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,19 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
} catch {
fatalError("\(error)")
}

let storyboard = UIStoryboard(name: "Main", bundle: nil)

// instantiate your desired ViewController
let rootController = storyboard.instantiateViewController(withIdentifier: "RootViewController") as! RootViewController

rootController.connect = connect

// Because self.window is an optional you should check it's value first and assign your rootViewController
if let window = self.window {
window.rootViewController = rootController
}

return true
}

Expand Down
10 changes: 5 additions & 5 deletions Example/Coherence/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1108" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<!--Root View Controller-->
<scene sceneID="ufC-wZ-h7g">
<objects>
<viewController id="vXZ-lx-hvc" sceneMemberID="viewController">
<viewController storyboardIdentifier="RootViewController" id="vXZ-lx-hvc" customClass="RootViewController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="jyV-Pf-zRb"/>
<viewControllerLayoutGuide type="bottom" id="2fi-mo-0CV"/>
Expand Down
5 changes: 5 additions & 0 deletions Example/Coherence/Coherence Example-Bridging-Header.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
//
// Use this file to import your target's public headers that you would like to expose to Swift.
//

#import "RootViewController.h"
14 changes: 14 additions & 0 deletions Example/Coherence/RootViewController.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
//
// RootViewController.h
// Coherence Example
//
// Created by Tony Stone on 5/22/18.
// Copyright © 2018 Tony Stone. All rights reserved.
//

#import <UIKit/UIKit.h>
@import Coherence;

@interface RootViewController : UIViewController
@property (nonatomic, strong) id <Connect> connect;
@end
40 changes: 40 additions & 0 deletions Example/Coherence/RootViewController.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
//
// RootViewController.m
// Coherence Example
//
// Created by Tony Stone on 5/22/18.
// Copyright © 2018 Tony Stone. All rights reserved.
//

#import "RootViewController.h"

@interface RootViewController ()

@end

@implementation RootViewController

@synthesize connect;

- (void)viewDidLoad {
[super viewDidLoad];

NSManagedObjectContext * context = [connect viewContext];
}

- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}

/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/

@end
14 changes: 7 additions & 7 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
PODS:
- Coherence (3.1.0):
- Coherence/Connect (= 3.1.0)
- Coherence/Container (= 3.1.0)
- Coherence (4.0.0-beta.1):
- Coherence/Connect (= 4.0.0-beta.1)
- Coherence/Container (= 4.0.0-beta.1)
- TraceLog (~> 3.0)
- Coherence/Connect (3.1.0):
- Coherence/Connect (4.0.0-beta.1):
- Coherence/Container
- Coherence/CoreExtensions
- TraceLog (~> 3.0)
- Coherence/Container (3.1.0):
- Coherence/Container (4.0.0-beta.1):
- Coherence/CoreExtensions
- TraceLog (~> 3.0)
- Coherence/CoreExtensions (3.1.0):
- Coherence/CoreExtensions (4.0.0-beta.1):
- TraceLog (~> 3.0)
- TraceLog (3.0.0):
- TraceLog/Swift (= 3.0.0)
Expand All @@ -29,7 +29,7 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
Coherence: 023f72f0a9bb6f27124febb6168f55c1ef2dd85f
Coherence: 209036c5df32cb5bc58a23526602d922436e1947
TraceLog: a1c0f9377886b4f31267239ade8bc6e3c8766ae1

PODFILE CHECKSUM: fd89c219e8334a2e68b1d4b55a67e29a08717970
Expand Down
5 changes: 3 additions & 2 deletions Example/Pods/Local Podspecs/Coherence.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions Example/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 21686bb

Please sign in to comment.