Skip to content

Commit d732afd

Browse files
committed
chore: GRDB static link
1 parent 5efd19c commit d732afd

File tree

5 files changed

+13
-14
lines changed

5 files changed

+13
-14
lines changed

Gemfile

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ source "https://rubygems.org"
22

33
gem "fastlane", "~> 2.216.0"
44
gem "cocoapods", "~> 1.13.0"
5+
gem "cocoapods-pod-linkage", "0.0.1"

Gemfile.lock

+3
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ GEM
6565
cocoapods-downloader (1.6.3)
6666
cocoapods-plugins (1.0.0)
6767
nap
68+
cocoapods-pod-linkage (0.0.1)
69+
cocoapods (~> 1.0)
6870
cocoapods-search (1.0.1)
6971
cocoapods-trunk (1.6.0)
7072
nap (>= 0.8, < 2.0)
@@ -275,6 +277,7 @@ PLATFORMS
275277

276278
DEPENDENCIES
277279
cocoapods (~> 1.13.0)
280+
cocoapods-pod-linkage (= 0.0.1)
278281
fastlane (~> 2.216.0)
279282

280283
BUNDLED WITH

Podfile

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
# Uncomment the next line to define a global platform for your project
22
source 'https://cdn.cocoapods.org/'
3+
plugin 'cocoapods-pod-linkage'
34

45
abstract_target 'iMastShared' do
56
# Comment the next line if you're not using Swift and don't want to use dynamic frameworks
67
use_frameworks!
78

89
pod 'SwiftLint', '0.52.4'
910
pod 'Alamofire', '~> 4.9.1'
10-
pod 'GRDB.swift', '~> 4.6.2'
11+
def core_pods
12+
pod 'GRDB.swift', '~> 4.6.2', :linkage => :static
13+
end
1114
pod 'SwiftyJSON', '5.0.0'
1215
pod 'HydraAsync', '~> 2.0.6'
1316
pod 'SDWebImage', '~> 5.12.6'
@@ -47,6 +50,7 @@ abstract_target 'iMastShared' do
4750
end
4851

4952
target 'iMastiOSCore' do
53+
core_pods
5054
end
5155
end
5256

@@ -59,6 +63,7 @@ abstract_target 'iMastShared' do
5963
end
6064

6165
target 'iMastMacCore' do
66+
core_pods
6267
end
6368
end
6469
end

Podfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,6 @@ SPEC CHECKSUMS:
7676
SwiftLint: 1cc5cd61ba9bacb2194e340aeb47a2a37fda00b3
7777
SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
7878

79-
PODFILE CHECKSUM: 16ea1823fabeb9f045560909120735c124fc0bc9
79+
PODFILE CHECKSUM: eec6d544bb8107e88e88e4075992f435b33bed36
8080

8181
COCOAPODS: 1.13.0

iMast.xcodeproj/project.pbxproj

+2-12
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
5D337B0226C952F600258CD1 /* UserProfileFieldViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D337B0126C952F600258CD1 /* UserProfileFieldViewController.swift */; };
2626
617DCFFE4FE3CD56EDE14AD4 /* Pods_iMastShared_Mac_iMastMacCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EEED81AAD927A30AFB818324 /* Pods_iMastShared_Mac_iMastMacCore.framework */; };
2727
78E0877ECED7B80513CC23A5 /* Pods_iMastShared_iOS_iMastNotifyService.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AE46AB9BC10111AED90813E9 /* Pods_iMastShared_iOS_iMastNotifyService.framework */; };
28-
904584C585DF8DF528E745A9 /* (null) in Frameworks */ = {isa = PBXBuildFile; };
28+
904584C585DF8DF528E745A9 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; };
2929
A7656BE4690605B053B4F2B1 /* Pods_iMastShared_iOS_iMast_iOS_iMastTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D659691936E0C9F88AA1BC71 /* Pods_iMastShared_iOS_iMast_iOS_iMastTests.framework */; };
3030
C97D891E6594EA490EEDC060 /* Pods_iMastShared_Mac_iMast_Mac__with_Sparkle_.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE03FF8425DCD85E0024BF70 /* Pods_iMastShared_Mac_iMast_Mac__with_Sparkle_.framework */; };
3131
CE030A6B2A42354800170E32 /* AddAccountAcquireTokenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE030A6A2A42354800170E32 /* AddAccountAcquireTokenViewController.swift */; };
@@ -1061,7 +1061,7 @@
10611061
buildActionMask = 2147483647;
10621062
files = (
10631063
CEE4E3332377F7D800406371 /* iMastMacCore.framework in Frameworks */,
1064-
904584C585DF8DF528E745A9 /* (null) in Frameworks */,
1064+
904584C585DF8DF528E745A9 /* BuildFile in Frameworks */,
10651065
3CB0034D20C8D2DE04A5A969 /* Pods_iMastShared_Mac_iMast_Mac__App_Store_.framework in Frameworks */,
10661066
);
10671067
runOnlyForDeploymentPostprocessing = 0;
@@ -2854,7 +2854,6 @@
28542854
"${PODS_ROOT}/Target Support Files/Pods-iMastShared-Mac-iMast Mac (App Store)/Pods-iMastShared-Mac-iMast Mac (App Store)-frameworks.sh",
28552855
"${BUILT_PRODUCTS_DIR}/Alamofire-macOS/Alamofire.framework",
28562856
"${BUILT_PRODUCTS_DIR}/Fuzi-macOS/Fuzi.framework",
2857-
"${BUILT_PRODUCTS_DIR}/GRDB.swift-macOS/GRDB.framework",
28582857
"${BUILT_PRODUCTS_DIR}/HydraAsync-macOS/Hydra.framework",
28592858
"${BUILT_PRODUCTS_DIR}/KeychainAccess-macOS/KeychainAccess.framework",
28602859
"${BUILT_PRODUCTS_DIR}/SDWebImage-macOS/SDWebImage.framework",
@@ -2865,7 +2864,6 @@
28652864
outputPaths = (
28662865
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
28672866
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Fuzi.framework",
2868-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GRDB.framework",
28692867
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Hydra.framework",
28702868
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KeychainAccess.framework",
28712869
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
@@ -2904,7 +2902,6 @@
29042902
"${PODS_ROOT}/Target Support Files/Pods-iMastShared-iOS-iMast iOS-iMastUITests/Pods-iMastShared-iOS-iMast iOS-iMastUITests-frameworks.sh",
29052903
"${BUILT_PRODUCTS_DIR}/Alamofire-iOS/Alamofire.framework",
29062904
"${BUILT_PRODUCTS_DIR}/Fuzi-iOS/Fuzi.framework",
2907-
"${BUILT_PRODUCTS_DIR}/GRDB.swift-iOS/GRDB.framework",
29082905
"${BUILT_PRODUCTS_DIR}/HydraAsync-iOS/Hydra.framework",
29092906
"${BUILT_PRODUCTS_DIR}/KeychainAccess-iOS/KeychainAccess.framework",
29102907
"${BUILT_PRODUCTS_DIR}/Mew/Mew.framework",
@@ -2918,7 +2915,6 @@
29182915
outputPaths = (
29192916
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
29202917
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Fuzi.framework",
2921-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GRDB.framework",
29222918
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Hydra.framework",
29232919
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KeychainAccess.framework",
29242920
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mew.framework",
@@ -2978,7 +2974,6 @@
29782974
"${PODS_ROOT}/Target Support Files/Pods-iMastShared-iOS-iMast iOS-iMastTests/Pods-iMastShared-iOS-iMast iOS-iMastTests-frameworks.sh",
29792975
"${BUILT_PRODUCTS_DIR}/Alamofire-iOS/Alamofire.framework",
29802976
"${BUILT_PRODUCTS_DIR}/Fuzi-iOS/Fuzi.framework",
2981-
"${BUILT_PRODUCTS_DIR}/GRDB.swift-iOS/GRDB.framework",
29822977
"${BUILT_PRODUCTS_DIR}/HydraAsync-iOS/Hydra.framework",
29832978
"${BUILT_PRODUCTS_DIR}/KeychainAccess-iOS/KeychainAccess.framework",
29842979
"${BUILT_PRODUCTS_DIR}/Mew/Mew.framework",
@@ -2992,7 +2987,6 @@
29922987
outputPaths = (
29932988
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
29942989
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Fuzi.framework",
2995-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GRDB.framework",
29962990
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Hydra.framework",
29972991
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KeychainAccess.framework",
29982992
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mew.framework",
@@ -3034,7 +3028,6 @@
30343028
"${PODS_ROOT}/Target Support Files/Pods-iMastShared-iOS-iMast iOS/Pods-iMastShared-iOS-iMast iOS-frameworks.sh",
30353029
"${BUILT_PRODUCTS_DIR}/Alamofire-iOS/Alamofire.framework",
30363030
"${BUILT_PRODUCTS_DIR}/Fuzi-iOS/Fuzi.framework",
3037-
"${BUILT_PRODUCTS_DIR}/GRDB.swift-iOS/GRDB.framework",
30383031
"${BUILT_PRODUCTS_DIR}/HydraAsync-iOS/Hydra.framework",
30393032
"${BUILT_PRODUCTS_DIR}/KeychainAccess-iOS/KeychainAccess.framework",
30403033
"${BUILT_PRODUCTS_DIR}/Mew/Mew.framework",
@@ -3048,7 +3041,6 @@
30483041
outputPaths = (
30493042
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
30503043
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Fuzi.framework",
3051-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GRDB.framework",
30523044
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Hydra.framework",
30533045
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KeychainAccess.framework",
30543046
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Mew.framework",
@@ -3285,7 +3277,6 @@
32853277
"${PODS_ROOT}/Target Support Files/Pods-iMastShared-Mac-iMast Mac (with Sparkle)/Pods-iMastShared-Mac-iMast Mac (with Sparkle)-frameworks.sh",
32863278
"${BUILT_PRODUCTS_DIR}/Alamofire-macOS/Alamofire.framework",
32873279
"${BUILT_PRODUCTS_DIR}/Fuzi-macOS/Fuzi.framework",
3288-
"${BUILT_PRODUCTS_DIR}/GRDB.swift-macOS/GRDB.framework",
32893280
"${BUILT_PRODUCTS_DIR}/HydraAsync-macOS/Hydra.framework",
32903281
"${BUILT_PRODUCTS_DIR}/KeychainAccess-macOS/KeychainAccess.framework",
32913282
"${BUILT_PRODUCTS_DIR}/SDWebImage-macOS/SDWebImage.framework",
@@ -3296,7 +3287,6 @@
32963287
outputPaths = (
32973288
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Alamofire.framework",
32983289
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Fuzi.framework",
3299-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GRDB.framework",
33003290
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Hydra.framework",
33013291
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KeychainAccess.framework",
33023292
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",

0 commit comments

Comments
 (0)