Merge pull request #4 from JanC/carthage

y500 · web-flow · commit 804ab4fbe4b9 · 2017-12-16T18:11:50.000+08:00
Added Carthage support
diff --git a/Cartfile b/Cartfile
@@ -0,0 +1,3 @@
+
+github "swisspol/GCDWebServer"
+github "ccgus/fmdb"
diff --git a/DebugDatabase/DatabaseUtil.m b/DebugDatabase/DatabaseUtil.m
@@ -8,7 +8,14 @@
 
 #import "DatabaseUtil.h"
 #import <sqlite3.h>
+
+#ifdef COCOAPODS
 #import "FMDB.h"
+#else
+#import <FMDB/FMDB.h>
+#endif
+
+
 
 @interface DatabaseUtil ()
 
diff --git a/DebugDatabase/DebugDatabaseManager.h b/DebugDatabase/DebugDatabaseManager.h
@@ -7,7 +7,12 @@
 //
 
 #import <Foundation/Foundation.h>
+
+#ifdef COCOAPODS
 #import <GCDWebServer/GCDWebServer.h>
+#else
+#import <GCDWebServers/GCDWebServers.h>
+#endif
 
 @interface DebugDatabaseManager : GCDWebServer
 
diff --git a/DebugDatabase/DebugDatabaseManager.m b/DebugDatabase/DebugDatabaseManager.m
@@ -10,8 +10,14 @@
 #import "NSURL+scheme.h"
 #import "DatabaseUtil.h"
 #import "NSString+json.h"
-#import "GCDWebServerRequest.h"
-#import "GCDWebServerDataResponse.h"
+#ifdef COCOAPODS
+#import <GCDWebServer/GCDWebServerRequest.h>
+#import <GCDWebServer/GCDWebServerDataResponse.h>
+#else
+#import <GCDWebServers/GCDWebServerRequest.h>
+#import <GCDWebServers/GCDWebServerDataResponse.h>
+#endif
+
 
 @interface DebugDatabaseManager ()<GCDWebServerDelegate>
 
diff --git a/DebugDatabase/Info.plist b/DebugDatabase/Info.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSPrincipalClass</key>
+	<string></string>
+</dict>
+</plist>
diff --git a/DebugDatabase/iOSDebugDatabase.h b/DebugDatabase/iOSDebugDatabase.h
@@ -0,0 +1,20 @@
+//
+//  iOSDebugDatabase.h
+//  iOSDebugDatabase
+//
+//  Created by Jan Chaloupecky on 16.12.17.
+//  Copyright © 2017 wentian. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+//! Project version number for iOSDebugDatabase.
+FOUNDATION_EXPORT double iOSDebugDatabaseVersionNumber;
+
+//! Project version string for iOSDebugDatabase.
+FOUNDATION_EXPORT const unsigned char iOSDebugDatabaseVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like
+#import <iOSDebugDatabase/DebugDatabaseManager.h>
+
+
diff --git a/README.md b/README.md
@@ -39,6 +39,22 @@ use_frameworks!
 pod 'YYDebugDatabase'
 ```
 
+#### Carthage
+
+- Cartfile
+
+```
+github "y500/iOSDebugDatabase"
+```
+
+- run `carthage update`
+
+- Add all three `.frameworks` to your target "Embedd Frameworks" Build Phase:
+ 	- `iOSDebugDatabase.framework`
+	- `FMDB.framework`
+	- `GCDWebServers.framework`
+
+
 #### Not build in Release
 
 First, add configurations in Podfile.
diff --git a/YYDebugDatabase.xcodeproj/project.pbxproj b/YYDebugDatabase.xcodeproj/project.pbxproj
diff --git a/YYDebugDatabase.xcodeproj/xcshareddata/xcschemes/iOSDebugDatabase-iOS.xcscheme b/YYDebugDatabase.xcodeproj/xcshareddata/xcschemes/iOSDebugDatabase-iOS.xcscheme

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+`
	`2`	`+github "swisspol/GCDWebServer"`
	`3`	`+github "ccgus/fmdb"`