Skip to content
This repository has been archived by the owner on Aug 12, 2022. It is now read-only.

Commit

Permalink
added support for swift package manager
Browse files Browse the repository at this point in the history
  • Loading branch information
@nilsvu
nilsvu committed Dec 18, 2015
1 parent f80a532 commit d1e33cb
Show file tree
Hide file tree
Showing 13 changed files with 61 additions and 34 deletions.
5 changes: 4 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@ xcuserdata
*.xccheckout
*.moved-aside
DerivedData
*.xcuserstate
*.xcuserstate

# Swift
.build/
4 changes: 2 additions & 2 deletions Evergreen.podspec
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Evergreen"
s.version = "0.7.0"
s.version = "0.7.1"
s.summary = "A Swift Logging Framework."
s.description = <<-DESC
Evergreen is a logging framework written in Swift.
Expand All @@ -11,6 +11,6 @@ Pod::Spec.new do |s|
s.license = { :type => "MIT", :file => "LICENSE.md" }
s.author = { "Nils Fischer" => "n.fischer@viwid.com" }
s.platform = :ios, "8.0"
s.source = { :git => "https://github.com/viWiD/Evergreen.git", :tag => "v0.7.0" }
s.source = { :git => "https://github.com/viWiD/Evergreen.git", :tag => "v0.7.1" }
s.source_files = "Evergreen"
end
58 changes: 29 additions & 29 deletions Evergreen.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
objects = {

/* Begin PBXBuildFile section */
87CA7F811AE7291C008D2DA0 /* Formatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87CA7F7C1AE7291C008D2DA0 /* Formatter.swift */; };
87CA7F821AE7291C008D2DA0 /* Handler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87CA7F7D1AE7291C008D2DA0 /* Handler.swift */; };
87CA7F841AE7291C008D2DA0 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87CA7F7F1AE7291C008D2DA0 /* Logger.swift */; };
87CA7F851AE7291C008D2DA0 /* Evergreen.h in Headers */ = {isa = PBXBuildFile; fileRef = 87CA7F801AE7291C008D2DA0 /* Evergreen.h */; settings = {ATTRIBUTES = (Public, ); }; };
87CA7F891AE7295A008D2DA0 /* EvergreenTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87CA7F871AE7295A008D2DA0 /* EvergreenTests.swift */; };
87C376071C23830000053D87 /* Evergreen.h in Headers */ = {isa = PBXBuildFile; fileRef = 87C376031C23830000053D87 /* Evergreen.h */; settings = {ATTRIBUTES = (Public, ); }; };
87C376081C23830000053D87 /* Formatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87C376041C23830000053D87 /* Formatter.swift */; };
87C376091C23830000053D87 /* Handler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87C376051C23830000053D87 /* Handler.swift */; };
87C3760A1C23830000053D87 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87C376061C23830000053D87 /* Logger.swift */; };
87C3760F1C23835100053D87 /* EvergreenTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 87C3760B1C23833700053D87 /* EvergreenTests.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -27,13 +27,13 @@
/* Begin PBXFileReference section */
87539B1F19DB23F00084658D /* Evergreen.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Evergreen.framework; sourceTree = BUILT_PRODUCTS_DIR; };
87539B2A19DB23F00084658D /* EvergreenTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = EvergreenTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
87CA7F7C1AE7291C008D2DA0 /* Formatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Formatter.swift; path = Evergreen/Formatter.swift; sourceTree = SOURCE_ROOT; };
87CA7F7D1AE7291C008D2DA0 /* Handler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Handler.swift; path = Evergreen/Handler.swift; sourceTree = SOURCE_ROOT; };
87CA7F7E1AE7291C008D2DA0 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Evergreen/Info.plist; sourceTree = SOURCE_ROOT; };
87CA7F7F1AE7291C008D2DA0 /* Logger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Logger.swift; path = Evergreen/Logger.swift; sourceTree = SOURCE_ROOT; };
87CA7F801AE7291C008D2DA0 /* Evergreen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Evergreen.h; path = Evergreen/Evergreen.h; sourceTree = SOURCE_ROOT; };
87CA7F861AE7295A008D2DA0 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = EvergreenTests/Info.plist; sourceTree = SOURCE_ROOT; };
87CA7F871AE7295A008D2DA0 /* EvergreenTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EvergreenTests.swift; path = EvergreenTests/EvergreenTests.swift; sourceTree = SOURCE_ROOT; };
87C376011C2382F400053D87 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Sources/Info.plist; sourceTree = SOURCE_ROOT; };
87C376031C23830000053D87 /* Evergreen.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Evergreen.h; path = Sources/Evergreen.h; sourceTree = SOURCE_ROOT; };
87C376041C23830000053D87 /* Formatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Formatter.swift; path = Sources/Formatter.swift; sourceTree = SOURCE_ROOT; };
87C376051C23830000053D87 /* Handler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Handler.swift; path = Sources/Handler.swift; sourceTree = SOURCE_ROOT; };
87C376061C23830000053D87 /* Logger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Logger.swift; path = Sources/Logger.swift; sourceTree = SOURCE_ROOT; };
87C3760B1C23833700053D87 /* EvergreenTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = EvergreenTests.swift; path = Tests/EvergreenTests.swift; sourceTree = SOURCE_ROOT; };
87C3760C1C23833700053D87 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Tests/Info.plist; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -75,10 +75,10 @@
87539B2119DB23F00084658D /* Evergreen */ = {
isa = PBXGroup;
children = (
87CA7F801AE7291C008D2DA0 /* Evergreen.h */,
87CA7F7F1AE7291C008D2DA0 /* Logger.swift */,
87CA7F7D1AE7291C008D2DA0 /* Handler.swift */,
87CA7F7C1AE7291C008D2DA0 /* Formatter.swift */,
87C376031C23830000053D87 /* Evergreen.h */,
87C376041C23830000053D87 /* Formatter.swift */,
87C376051C23830000053D87 /* Handler.swift */,
87C376061C23830000053D87 /* Logger.swift */,
87539B2219DB23F00084658D /* Supporting Files */,
);
name = Evergreen;
Expand All @@ -88,15 +88,15 @@
87539B2219DB23F00084658D /* Supporting Files */ = {
isa = PBXGroup;
children = (
87CA7F7E1AE7291C008D2DA0 /* Info.plist */,
87C376011C2382F400053D87 /* Info.plist */,
);
name = "Supporting Files";
sourceTree = "<group>";
};
87539B2B19DB23F00084658D /* EvergreenTests */ = {
isa = PBXGroup;
children = (
87CA7F871AE7295A008D2DA0 /* EvergreenTests.swift */,
87C3760B1C23833700053D87 /* EvergreenTests.swift */,
87539B2C19DB23F00084658D /* Supporting Files */,
);
name = EvergreenTests;
Expand All @@ -106,7 +106,7 @@
87539B2C19DB23F00084658D /* Supporting Files */ = {
isa = PBXGroup;
children = (
87CA7F861AE7295A008D2DA0 /* Info.plist */,
87C3760C1C23833700053D87 /* Info.plist */,
);
name = "Supporting Files";
sourceTree = "<group>";
Expand All @@ -118,7 +118,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
87CA7F851AE7291C008D2DA0 /* Evergreen.h in Headers */,
87C376071C23830000053D87 /* Evergreen.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -168,7 +168,7 @@
isa = PBXProject;
attributes = {
LastSwiftMigration = 0700;
LastSwiftUpdateCheck = 0700;
LastSwiftUpdateCheck = 0720;
LastUpgradeCheck = 0700;
ORGANIZATIONNAME = "viWiD Webdesign & iOS Development";
TargetAttributes = {
Expand Down Expand Up @@ -220,17 +220,17 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
87CA7F821AE7291C008D2DA0 /* Handler.swift in Sources */,
87CA7F841AE7291C008D2DA0 /* Logger.swift in Sources */,
87CA7F811AE7291C008D2DA0 /* Formatter.swift in Sources */,
87C376091C23830000053D87 /* Handler.swift in Sources */,
87C3760A1C23830000053D87 /* Logger.swift in Sources */,
87C376081C23830000053D87 /* Formatter.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
87539B2619DB23F00084658D /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
87CA7F891AE7295A008D2DA0 /* EvergreenTests.swift in Sources */,
87C3760F1C23835100053D87 /* EvergreenTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -334,7 +334,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "$(SRCROOT)/Evergreen/Info.plist";
INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.viwid.$(PRODUCT_NAME:rfc1034identifier)";
Expand All @@ -353,7 +353,7 @@
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = "$(SRCROOT)/Evergreen/Info.plist";
INFOPLIST_FILE = "$(SRCROOT)/Sources/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.viwid.$(PRODUCT_NAME:rfc1034identifier)";
Expand All @@ -374,7 +374,7 @@
"DEBUG=1",
"$(inherited)",
);
INFOPLIST_FILE = EvergreenTests/Info.plist;
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.viwid.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = EvergreenTests;
Expand All @@ -390,7 +390,7 @@
"$(SDKROOT)/Developer/Library/Frameworks",
"$(inherited)",
);
INFOPLIST_FILE = EvergreenTests/Info.plist;
INFOPLIST_FILE = Tests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.viwid.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = EvergreenTests;
Expand Down
3 changes: 3 additions & 0 deletions Evergreen.xcworkspace/contents.xcworkspacedata
View file

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

5 changes: 5 additions & 0 deletions Package.swift
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import PackageDescription

let package = Package(
name: "Evergreen"
)
16 changes: 16 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,22 @@ The easiest way to integrate Evergreen into your project is via [CocoaPods](http

As usual with CocoaPods, make sure to use the `*.xcworkspace` instead of the `*.xcodeproj`.

### Swift Package Manager (currently in beta)

You can also use the Swift Package Manager included in the [Swift 2.2 beta](https://swift.org/download/). Just add Evergreen as a dependency to your package description, like this:

```swift
import PackageDescription

let package = Package(
name: "HelloWorld",
dependencies: [
.Package(url: "https://github.com/viWiD/Evergreen.git", majorVersion: 0),
// ...
]
)
```

### Manually

You can also integrate Evergreen into you project manually:
Expand Down
0 Evergreen/Evergreen.h → Sources/Evergreen.h
View file
File renamed without changes.
0 Evergreen/Formatter.swift → Sources/Formatter.swift
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion Evergreen/Handler.swift → Sources/Handler.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public class FileHandler: Handler, CustomStringConvertible {
}

public var description: String {
return "\(_stdlib_getDemangledTypeName(self))(\(fileURL))"
return "FileHandler(\(fileURL))"
}

}
Expand Down
2 changes: 1 addition & 1 deletion Evergreen/Info.plist → Sources/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>0.5.0</string>
<string>0.7.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
0 Evergreen/Logger.swift → Sources/Logger.swift
View file
File renamed without changes.
0 EvergreenTests/EvergreenTests.swift → Tests/EvergreenTests.swift
View file
File renamed without changes.
0 EvergreenTests/Info.plist → Tests/Info.plist
View file
File renamed without changes.

0 comments on commit d1e33cb

Please sign in to comment.