From 3a7b1932fc4b183dc0d934ba0d4bff9395c0b23c Mon Sep 17 00:00:00 2001 From: Pasin Suriyentrakorn Date: Thu, 12 Apr 2018 11:08:22 -0700 Subject: [PATCH] Correct podspecs and README --- ...ift.podspec => CouchbaseLite-Swift.podspec | 4 +-- CouchbaseLite.podspec | 2 +- README.md | 36 ++++++++++++++++--- 3 files changed, 34 insertions(+), 8 deletions(-) rename CouchbaseLiteSwift.podspec => CouchbaseLite-Swift.podspec (87%) diff --git a/CouchbaseLiteSwift.podspec b/CouchbaseLite-Swift.podspec similarity index 87% rename from CouchbaseLiteSwift.podspec rename to CouchbaseLite-Swift.podspec index f757709bc..0f58510f2 100644 --- a/CouchbaseLiteSwift.podspec +++ b/CouchbaseLite-Swift.podspec @@ -1,8 +1,8 @@ Pod::Spec.new do |s| - s.name = 'CouchbaseLiteSwift' + s.name = 'CouchbaseLite-Swift' s.version = '2.0.0' s.license = 'Apache License, Version 2.0' - s.homepage = 'http://mobile.couchbase.com' + s.homepage = 'https://github.com/couchbase/couchbase-lite-ios' s.summary = 'An embedded syncable NoSQL database for iOS and MacOS apps.' s.author = 'Couchbase' s.source = { :git => 'https://github.com/couchbase/couchbase-lite-ios.git', :tag => s.version, :submodules => true } diff --git a/CouchbaseLite.podspec b/CouchbaseLite.podspec index cb74ed1e5..2dbb72d2e 100644 --- a/CouchbaseLite.podspec +++ b/CouchbaseLite.podspec @@ -2,7 +2,7 @@ Pod::Spec.new do |s| s.name = 'CouchbaseLite' s.version = '2.0.0' s.license = 'Apache License, Version 2.0' - s.homepage = 'http://mobile.couchbase.com' + s.homepage = 'https://github.com/couchbase/couchbase-lite-ios' s.summary = 'An embedded syncable NoSQL database for iOS and MacOS apps.' s.author = 'Couchbase' s.source = { :git => 'https://github.com/couchbase/couchbase-lite-ios.git', :tag => s.version, :submodules => true } diff --git a/README.md b/README.md index f04f628f9..3674bade1 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,9 @@ Couchbase Lite 2.0 has a completely new set of APIs. The implementation is on to You can use [CocoaPods](https://cocoapods.org/) to install `CouchbaseLite` for Objective-C API or `CouchbaseLiteSwift` for Swift API by adding it in your [Podfile](https://guides.cocoapods.org/using/the-podfile.html): -#### CouchbaseLite (Objective-C API) +#### Objective-C + +##### Community Edition ``` target '' do use_frameworks! @@ -25,11 +27,29 @@ target '' do end ``` -#### CouchbaseLiteSwift (Swift API) +##### Enterprise Edition ``` target '' do use_frameworks! - pod 'CouchbaseLiteSwift', '~> 2.0.0' + pod 'CouchbaseLite-Enterprise', '~> 2.0.0' +end +``` + +#### Swift + +##### Community Edition +``` +target '' do + use_frameworks! + pod 'CouchbaseLite-Swift', '~> 2.0.0' +end +``` + +##### Enterprise Edition +``` +target '' do + use_frameworks! + pod 'CouchbaseLite-Swift-Enterprise', '~> 2.0.0' end ``` @@ -37,8 +57,14 @@ end You can use [Carthage](https://github.com/Carthage/Carthage) to install `CouchbaseLite` by adding it in your [Cartfile](https://github.com/Carthage/Carthage/blob/master/Documentation/Artifacts.md#cartfile): +##### Community Edition +``` +binary "https://raw.githubusercontent.com/couchbase/couchbase-lite-ios/master/Release/Carthage/CouchbaseLite-Community.json" ~> 2.0.0 +``` + +##### Enterprise Edition ``` -github "couchbase/couchbase-lite-ios" "2.0.0" +binary "https://raw.githubusercontent.com/couchbase/couchbase-lite-ios/master/Release/Carthage/CouchbaseLite-Enterprise.json" ~> 2.0.0 ``` > When running `carthage update or build`, Carthage will build both CouchbaseLite and CouchbaseLiteSwift framework. @@ -53,7 +79,7 @@ $ git submodule update --init --recursive $ cd couchbase-lite-ios ``` -2. Run ./Scripts/build_framework.sh to build a platform framework which could be either an Objective-C or a Swift framework. The supported platforms include iOS and macOS. +2. Run ./Scripts/build_framework.sh to build a platform framework which could be either an Objective-C or a Swift framework. The supported platforms include iOS, tvOS, and macOS. ``` $ ./Scripts/build_framework.sh -s "CBL ObjC" -p iOS -o output // For building the ObjC framework for iOS