Skip to content

Commit c1b2af0

Browse files
committed
Use Swift Package Manager to use Sparkle
1 parent 49aa9c7 commit c1b2af0

File tree

7 files changed

+14
-16
lines changed

7 files changed

+14
-16
lines changed

.gitmodules

Lines changed: 0 additions & 4 deletions
This file was deleted.

.vscode/settings.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"**/*.dmg": true,
77
"**/build_xcode/": true,
88
"**/build/": true,
9-
"src/vendor/Sparkle/": true,
109
"tmp/": true
1110
},
1211
"files.watcherExclude": {

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ clean:
1717

1818
gitclean:
1919
git clean -f -x -d
20-
(cd src/vendor/Sparkle && git clean -f -x -d)
2120

2221
ibtool-upgrade:
2322
find * -name '*.xib' | while read f; do xcrun ibtool --upgrade "$$f"; done

src/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
all:
22
/usr/bin/python3 ../scripts/update-version.py
33
bash run-xcodegen.sh
4-
$(MAKE) -C vendor
54
xcodebuild -configuration Release -alltargets SYMROOT="$(CURDIR)/build"
65

76
clean:
8-
$(MAKE) -C vendor clean
97
rm -rf ShowyEdge.xcodeproj
108
rm -rf build
119

src/project-base.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
name: ShowyEdge
22
options:
33
bundleIdPrefix: org.pqrs
4+
packages:
5+
# We have to declare all packages in project-base.yml instead of separated in project-base.yml and project-with-codesign.yml to avoid `Could not resolve package dependencies` error,
6+
# when the codesign requirement is changed between builds.
7+
# (For example, the first build is with codesign, then the second build is without codesign.)
8+
Sparkle:
9+
url: https://github.com/sparkle-project/Sparkle
10+
from: 1.26.0
411

512
targets:
613
ShowyEdge:

src/project-with-codesign.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ targets:
77
configs:
88
debug:
99
GCC_PREPROCESSOR_DEFINITIONS:
10-
- "$(inherited)"
11-
- DEBUG=1
12-
- USE_SPARKLE=1
13-
SWIFT_ACTIVE_COMPILATION_CONDITIONS: "USE_SPARKLE DEBUG"
10+
- '$(inherited)'
11+
- DEBUG=1
12+
- USE_SPARKLE=1
13+
SWIFT_ACTIVE_COMPILATION_CONDITIONS: 'USE_SPARKLE DEBUG'
1414
release:
1515
GCC_PREPROCESSOR_DEFINITIONS:
16-
- "$(inherited)"
16+
- '$(inherited)'
1717
- USE_SPARKLE=1
18-
SWIFT_ACTIVE_COMPILATION_CONDITIONS: "USE_SPARKLE"
18+
SWIFT_ACTIVE_COMPILATION_CONDITIONS: 'USE_SPARKLE'
1919
dependencies:
20-
- framework: vendor/Sparkle/build/Build/Products/Release/Sparkle.framework
20+
- package: Sparkle

src/vendor/Sparkle

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)