Skip to content

Commit f33eb9a

Browse files
SzymonMrozekSzymonMrozek
authored
Merge pull request #4 from appunite/update-package
Update and cleanup package
2 parents df18e3c + cf08fcb commit f33eb9a

File tree

3 files changed

+19
-143
lines changed

3 files changed

+19
-143
lines changed

‎Makefile

+1-26
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,7 @@ TEMPORARY_FOLDER = ./tmp
55
SWIFT_BUILD_FLAGS=--configuration release
66
EXECUTABLE_FOLDER=$(shell swift build $(SWIFT_BUILD_FLAGS) --show-bin-path)
77
BINARY_NAME=fibs
8-
LIB_AGENTCORE_DYLIB_NAME=libagentcore.dylib
9-
LIB_CPUPLUGIN_DYLIB_NAME=libcpuplugin.dylib
10-
LIB_ENVPLUGIN_DYLIB_NAME=libenvplugin.dylib
11-
LIB_HCAPLUGIN_DYLIB_NAME=libhcapiplugin.dylib
12-
LIB_MEMPLUGIN_DYLIB_NAME=libmemplugin.dylib
138
BINARY_EXECUTABLE=$(EXECUTABLE_FOLDER)/$(BINARY_NAME)
14-
LIB_AGENTCORE_DYLIB=$(EXECUTABLE_FOLDER)/$(LIB_AGENTCORE_DYLIB_NAME)
15-
LIB_CPUPLUGIN_DYLIB=$(EXECUTABLE_FOLDER)/$(LIB_CPUPLUGIN_DYLIB_NAME)
16-
LIB_ENVPLUGIN_DYLIB=$(EXECUTABLE_FOLDER)/$(LIB_ENVPLUGIN_DYLIB_NAME)
17-
LIB_HCAPLUGIN_DYLIB=$(EXECUTABLE_FOLDER)/$(LIB_HCAPLUGIN_DYLIB_NAME)
18-
LIB_MEMPLUGIN_DYLIB=$(EXECUTABLE_FOLDER)/$(LIB_MEMPLUGIN_DYLIB_NAME)
199
LICENSE_PATH="$(shell pwd)/LICENSE.md"
2010
GIT_CURRENT_TAG=$(shell git describe --abbrev=0 --tags)
2111

@@ -70,11 +60,6 @@ gems: ## Bootstrap gems dependencies
7060

7161
build-release: ## Build with release configuration
7262
swift build $(SWIFT_BUILD_FLAGS)
73-
install_name_tool -change $(LIB_AGENTCORE_DYLIB) @loader_path/$(LIB_AGENTCORE_DYLIB_NAME) $(BINARY_EXECUTABLE)
74-
install_name_tool -change $(LIB_CPUPLUGIN_DYLIB) @loader_path/$(LIB_CPUPLUGIN_DYLIB_NAME) $(BINARY_EXECUTABLE)
75-
install_name_tool -change $(LIB_ENVPLUGIN_DYLIB) @loader_path/$(LIB_ENVPLUGIN_DYLIB_NAME) $(BINARY_EXECUTABLE)
76-
install_name_tool -change $(LIB_HCAPLUGIN_DYLIB) @loader_path/$(LIB_HCAPLUGIN_DYLIB_NAME) $(BINARY_EXECUTABLE)
77-
install_name_tool -change $(LIB_MEMPLUGIN_DYLIB) @loader_path/$(LIB_MEMPLUGIN_DYLIB_NAME) $(BINARY_EXECUTABLE)
7863

7964
cocoapods-fresh: ## update repository and then try to instal pods
8065
@echo "--- Updating cocoapods repos..."
@@ -87,22 +72,12 @@ sourcery: ## Meta - code generator
8772
install: ## Install binaries in local bin path
8873
install -d "$(BINARIES_FOLDER)"
8974
install "$(BINARY_EXECUTABLE)" "$(BINARIES_FOLDER)"
90-
install "$(LIB_AGENTCORE_DYLIB)" "$(BINARIES_FOLDER)"
91-
install "$(LIB_HCAPLUGIN_DYLIB)" "$(BINARIES_FOLDER)"
92-
install "$(LIB_CPUPLUGIN_DYLIB)" "$(BINARIES_FOLDER)"
93-
install "$(LIB_ENVPLUGIN_DYLIB)" "$(BINARIES_FOLDER)"
94-
install "$(LIB_MEMPLUGIN_DYLIB)" "$(BINARIES_FOLDER)"
9575

9676
zip: install ## Zip all binaries into embeded zip file
9777
mkdir -p "$(TEMPORARY_FOLDER)/"
9878
cp -f "$(BINARIES_FOLDER)/$(BINARY_NAME)" "$(TEMPORARY_FOLDER)"
99-
cp -f "$(BINARIES_FOLDER)/$(LIB_AGENTCORE_DYLIB_NAME)" "$(TEMPORARY_FOLDER)"
100-
cp -f "$(BINARIES_FOLDER)/$(LIB_CPUPLUGIN_DYLIB_NAME)" "$(TEMPORARY_FOLDER)"
101-
cp -f "$(BINARIES_FOLDER)/$(LIB_ENVPLUGIN_DYLIB_NAME)" "$(TEMPORARY_FOLDER)"
102-
cp -f "$(BINARIES_FOLDER)/$(LIB_HCAPLUGIN_DYLIB_NAME)" "$(TEMPORARY_FOLDER)"
103-
cp -f "$(BINARIES_FOLDER)/$(LIB_MEMPLUGIN_DYLIB_NAME)" "$(TEMPORARY_FOLDER)"
10479
cp -f "$(LICENSE_PATH)" "$(TEMPORARY_FOLDER)"
105-
(cd "$(TEMPORARY_FOLDER)"; zip -yr - "$(BINARY_NAME)" $(LIB_AGENTCORE_DYLIB_NAME) $(LIB_CPUPLUGIN_DYLIB_NAME) $(LIB_CPUPLUGIN_DYLIB_NAME) $(LIB_ENVPLUGIN_DYLIB_NAME) $(LIB_HCAPLUGIN_DYLIB_NAME) $(LIB_MEMPLUGIN_DYLIB_NAME) "LICENSE.md") > "./$(BINARY_NAME).zip"
80+
(cd "$(TEMPORARY_FOLDER)"; zip -yr - "$(BINARY_NAME)" "LICENSE.md") > "./$(BINARY_NAME).zip"
10681

10782
generate-podspec: ## Generate podspec file
10883
@echo "$$PODSPEC_CONTENTS" > Fibs.podspec.json

‎Package.resolved

+16-106
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,40 @@
11
{
22
"object": {
33
"pins": [
4-
{
5-
"package": "Cryptor",
6-
"repositoryURL": "https://github.com/IBM-Swift/BlueCryptor.git",
7-
"state": {
8-
"branch": null,
9-
"revision": "6f79b4ea0a7ef8acb08ba3f3e23da32e83acaca3",
10-
"version": "1.0.28"
11-
}
12-
},
134
{
145
"package": "Socket",
156
"repositoryURL": "https://github.com/IBM-Swift/BlueSocket.git",
167
"state": {
178
"branch": null,
18-
"revision": "ccc671b022bc60e5fffcb2aa15f499c6331bfd18",
19-
"version": "1.0.46"
9+
"revision": "c46a3d41f5b2401d18bcb46d0101cdc5cd13e307",
10+
"version": "1.0.52"
2011
}
2112
},
2213
{
2314
"package": "SSLService",
2415
"repositoryURL": "https://github.com/IBM-Swift/BlueSSLService.git",
2516
"state": {
2617
"branch": null,
27-
"revision": "0127cd4156bb0ba702894f2509199e4b65ca1db5",
28-
"version": "1.0.46"
29-
}
30-
},
31-
{
32-
"package": "CloudEnvironment",
33-
"repositoryURL": "https://github.com/IBM-Swift/CloudEnvironment.git",
34-
"state": {
35-
"branch": null,
36-
"revision": "91f4da3c5d24804bb7bbba98705f1c722d453ad8",
37-
"version": "9.1.0"
38-
}
39-
},
40-
{
41-
"package": "Configuration",
42-
"repositoryURL": "https://github.com/IBM-Swift/Configuration.git",
43-
"state": {
44-
"branch": null,
45-
"revision": "1319813a098ce20bd02160d81aa59e8a9037a179",
46-
"version": "3.0.3"
47-
}
48-
},
49-
{
50-
"package": "FileKit",
51-
"repositoryURL": "https://github.com/IBM-Swift/FileKit.git",
52-
"state": {
53-
"branch": null,
54-
"revision": "26911acde61a3556b7583f84180048ea6a03973c",
55-
"version": "0.0.2"
56-
}
57-
},
58-
{
59-
"package": "HeliumLogger",
60-
"repositoryURL": "https://github.com/IBM-Swift/HeliumLogger.git",
61-
"state": {
62-
"branch": null,
63-
"revision": "779865e83149a59894b14950aa83f70b7e81bc27",
64-
"version": "1.8.1"
18+
"revision": "ab2c2aa2fe574969f391c80ee87746be431dee0e",
19+
"version": "1.0.52"
6520
}
6621
},
6722
{
6823
"package": "Kitura",
6924
"repositoryURL": "https://github.com/IBM-Swift/Kitura.git",
7025
"state": {
7126
"branch": null,
72-
"revision": "f19737e885be1dbc97f146e9af3fe99fe7b67b72",
73-
"version": "2.7.0"
27+
"revision": "bbb7462ac3d422cad4480a57ddbd33263c381a7b",
28+
"version": "2.9.1"
7429
}
7530
},
7631
{
7732
"package": "Kitura-net",
7833
"repositoryURL": "https://github.com/IBM-Swift/Kitura-net.git",
7934
"state": {
8035
"branch": null,
81-
"revision": "5fc06b21e8e615147fa8341c249ae010a1b41fba",
82-
"version": "2.3.0"
83-
}
84-
},
85-
{
86-
"package": "KituraOpenAPI",
87-
"repositoryURL": "https://github.com/IBM-Swift/Kitura-OpenAPI.git",
88-
"state": {
89-
"branch": null,
90-
"revision": "7c0f961ee9499cc0a5623cfad571bd10b8019e95",
91-
"version": "1.2.1"
36+
"revision": "00985729329b73f3e20e40ec43071e4c294dfea3",
37+
"version": "2.4.0"
9238
}
9339
},
9440
{
@@ -100,22 +46,13 @@
10046
"version": "2.0.1"
10147
}
10248
},
103-
{
104-
"package": "Kitura-WebSocket",
105-
"repositoryURL": "https://github.com/IBM-Swift/Kitura-WebSocket.git",
106-
"state": {
107-
"branch": null,
108-
"revision": "2595b0a9a4579e7c4abc61c52c588c4fcf988232",
109-
"version": "2.1.2"
110-
}
111-
},
11249
{
11350
"package": "KituraContracts",
11451
"repositoryURL": "https://github.com/IBM-Swift/KituraContracts.git",
11552
"state": {
11653
"branch": null,
117-
"revision": "bdd4abf3932e11388ab690ea72a43e17b98dfd78",
118-
"version": "1.1.3"
54+
"revision": "a30e2fb79e926672776a05ec6b919c239870a221",
55+
"version": "1.2.1"
11956
}
12057
},
12158
{
@@ -127,58 +64,31 @@
12764
"version": "1.9.0"
12865
}
12966
},
130-
{
131-
"package": "omr-agentcore",
132-
"repositoryURL": "https://github.com/RuntimeTools/omr-agentcore",
133-
"state": {
134-
"branch": null,
135-
"revision": "5a2361ba1f005596a2bfa28de76ed4acf1e71c33",
136-
"version": "3.2.4-swift4"
137-
}
138-
},
13967
{
14068
"package": "ShellOut",
14169
"repositoryURL": "https://github.com/JohnSundell/ShellOut.git",
14270
"state": {
14371
"branch": null,
144-
"revision": "d3d54ce662dfee7fef619330b71d251b8d4869f9",
145-
"version": "2.2.0"
146-
}
147-
},
148-
{
149-
"package": "CloudFoundryEnv",
150-
"repositoryURL": "https://github.com/IBM-Swift/Swift-cfenv.git",
151-
"state": {
152-
"branch": null,
153-
"revision": "b6625a49d65f83036f0e9922b7e9f2fa66cb623e",
154-
"version": "6.0.3"
72+
"revision": "e1577acf2b6e90086d01a6d5e2b8efdaae033568",
73+
"version": "2.3.0"
15574
}
15675
},
15776
{
15877
"package": "swift-log",
15978
"repositoryURL": "https://github.com/apple/swift-log.git",
16079
"state": {
16180
"branch": null,
162-
"revision": "f4240bf022a69815241a883c03645444b58ac553",
163-
"version": "1.1.0"
164-
}
165-
},
166-
{
167-
"package": "SwiftMetrics",
168-
"repositoryURL": "https://github.com/RuntimeTools/SwiftMetrics.git",
169-
"state": {
170-
"branch": null,
171-
"revision": "c96b4c5e79dc5a89916ce00b3507f54fb758186d",
172-
"version": "2.6.3"
81+
"revision": "74d7b91ceebc85daf387ebb206003f78813f71aa",
82+
"version": "1.2.0"
17383
}
17484
},
17585
{
17686
"package": "TypeDecoder",
17787
"repositoryURL": "https://github.com/IBM-Swift/TypeDecoder.git",
17888
"state": {
17989
"branch": null,
180-
"revision": "39bb56b3b5c8ffb1b475c529fb1cfdb64e709a02",
181-
"version": "1.3.3"
90+
"revision": "a5978582981f7151594bdaf5fe0d3cd9b1d2d0c0",
91+
"version": "1.3.4"
18292
}
18393
}
18494
]

‎Package.swift

+2-11
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@ import PackageDescription
33

44
let package = Package(
55
name: "Fibs",
6+
platforms: [.macOS(.v10_12)],
67
dependencies: [
7-
.package(url: "https://github.com/IBM-Swift/Kitura.git", .upToNextMinor(from: "2.7.0")),
8-
.package(url: "https://github.com/IBM-Swift/HeliumLogger.git", .upToNextMinor(from: "1.8.0")),
9-
.package(url: "https://github.com/IBM-Swift/CloudEnvironment.git", from: "9.1.0"),
10-
.package(url: "https://github.com/IBM-Swift/Kitura-OpenAPI.git", from: "1.2.0"),
11-
.package(url: "https://github.com/RuntimeTools/SwiftMetrics.git", from: "2.6.0"),
8+
.package(url: "https://github.com/IBM-Swift/Kitura.git", .upToNextMinor(from: "2.9.1")),
129
.package(url: "https://github.com/JohnSundell/ShellOut.git", from: "2.2.0")
1310
],
1411
targets: [
@@ -30,19 +27,13 @@ let package = Package(
3027
name: "fibs-core",
3128
dependencies: [
3229
"Kitura",
33-
"KituraOpenAPI",
34-
"CloudEnvironment",
35-
"SwiftMetrics",
3630
"ShellOut"
3731
]
3832
),
3933
.testTarget(
4034
name: "fibs-core-tests",
4135
dependencies: [
4236
.target(name: "fibs-core"),
43-
"KituraOpenAPI",
44-
"CloudEnvironment",
45-
"SwiftMetrics",
4637
"ShellOut"
4738
]
4839
)

0 commit comments

Comments
 (0)