Skip to content

Commit a592b64

Browse files
authored
Merge pull request #16 from 1998code/restructure
Restructure system for 6.1
2 parents de5d957 + bbc7f5e commit a592b64

File tree

21 files changed

+1435
-634
lines changed

21 files changed

+1435
-634
lines changed

Demo/What's New?.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@
313313
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
314314
CODE_SIGN_ENTITLEMENTS = "What's New?/What_s_New_.entitlements";
315315
CODE_SIGN_STYLE = Automatic;
316-
CURRENT_PROJECT_VERSION = 15;
316+
CURRENT_PROJECT_VERSION = 16;
317317
DEVELOPMENT_ASSET_PATHS = "\"What's New?/Preview Content\"";
318318
DEVELOPMENT_TEAM = "";
319319
ENABLE_HARDENED_RUNTIME = YES;
@@ -327,7 +327,7 @@
327327
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
328328
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
329329
MACOSX_DEPLOYMENT_TARGET = 14.0;
330-
MARKETING_VERSION = 6.0;
330+
MARKETING_VERSION = 6.1;
331331
PRODUCT_BUNDLE_IDENTIFIER = io.startway.WhatsNew;
332332
PRODUCT_NAME = "$(TARGET_NAME)";
333333
SDKROOT = auto;
@@ -350,7 +350,7 @@
350350
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
351351
CODE_SIGN_ENTITLEMENTS = "What's New?/What_s_New_.entitlements";
352352
CODE_SIGN_STYLE = Automatic;
353-
CURRENT_PROJECT_VERSION = 15;
353+
CURRENT_PROJECT_VERSION = 16;
354354
DEVELOPMENT_ASSET_PATHS = "\"What's New?/Preview Content\"";
355355
DEVELOPMENT_TEAM = "";
356356
ENABLE_HARDENED_RUNTIME = YES;
@@ -364,7 +364,7 @@
364364
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
365365
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
366366
MACOSX_DEPLOYMENT_TARGET = 14.0;
367-
MARKETING_VERSION = 6.0;
367+
MARKETING_VERSION = 6.1;
368368
PRODUCT_BUNDLE_IDENTIFIER = io.startway.WhatsNew;
369369
PRODUCT_NAME = "$(TARGET_NAME)";
370370
SDKROOT = auto;

Demo/What's New?/en.lproj/data.json

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[
22
{
3-
"version": "6.0",
4-
"subVersion": "6.0.0",
3+
"version": "6.1",
4+
"subVersion": "6.1.0",
55
"new": [
66
{
7-
"icon": "wineglass",
8-
"title": "Glass",
9-
"subtitle": "Effect",
10-
"body": "Coming Soon!"
7+
"icon": "hammer",
8+
"title": "Project",
9+
"subtitle": "Restructure",
10+
"body": "Seperate files and folders for better maintenance."
1111
},
1212
{
1313
"icon": "macpro.gen3.server",
@@ -23,6 +23,18 @@
2323
}
2424
]
2525
},
26+
{
27+
"version": "6.0",
28+
"subVersion": "6.0.0",
29+
"new": [
30+
{
31+
"icon": "wineglass",
32+
"title": "Glass",
33+
"subtitle": "Effect",
34+
"body": "Available now!"
35+
}
36+
]
37+
},
2638
{
2739
"version": "5.5",
2840
"subVersion": "5.5.0",

Demo/What's New?/ja.lproj/data.json

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[
22
{
3-
"version": "6.0",
4-
"subVersion": "6.0.0",
3+
"version": "6.1",
4+
"subVersion": "6.1.0",
55
"new": [
66
{
7-
"icon": "wineglass",
8-
"title": "ガラス",
9-
"subtitle": "エフェクト",
10-
"body": "近日公開予定!"
7+
"icon": "hammer",
8+
"title": "プロジェクト",
9+
"subtitle": "リストラクチャ",
10+
"body": "より良いメンテナンスのためのファイルとフォルダの分離。"
1111
},
1212
{
1313
"icon": "macpro.gen3.server",
@@ -23,6 +23,18 @@
2323
}
2424
]
2525
},
26+
{
27+
"version": "6.0",
28+
"subVersion": "6.0.0",
29+
"new": [
30+
{
31+
"icon": "wineglass",
32+
"title": "ガラス",
33+
"subtitle": "エフェクト",
34+
"body": "利用可能になりました!"
35+
}
36+
]
37+
},
2638
{
2739
"version": "5.5",
2840
"subVersion": "5.5.0",

Demo/What's New?/ko.lproj/data.json

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[
22
{
3-
"version": "6.0",
4-
"subVersion": "6.0.0",
3+
"version": "6.1",
4+
"subVersion": "6.1.0",
55
"new": [
66
{
7-
"icon": "wineglass",
8-
"title": "유리",
9-
"subtitle": "효과",
10-
"body": "곧 출시 예정!"
7+
"icon": "hammer",
8+
"title": "프로젝트",
9+
"subtitle": "재구성",
10+
"body": "더 나은 유지보수를 위한 파일과 폴더 분리."
1111
},
1212
{
1313
"icon": "macpro.gen3.server",
@@ -23,6 +23,18 @@
2323
}
2424
]
2525
},
26+
{
27+
"version": "6.0",
28+
"subVersion": "6.0.0",
29+
"new": [
30+
{
31+
"icon": "wineglass",
32+
"title": "유리",
33+
"subtitle": "효과",
34+
"body": "지금 사용 가능!"
35+
}
36+
]
37+
},
2638
{
2739
"version": "5.5",
2840
"subVersion": "5.5.0",

Demo/What's New?/zh-Hans.lproj/data.json

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[
22
{
3-
"version": "6.0",
4-
"subVersion": "6.0.0",
3+
"version": "6.1",
4+
"subVersion": "6.1.0",
55
"new": [
66
{
7-
"icon": "wineglass",
8-
"title": "玻璃",
9-
"subtitle": "效果",
10-
"body": "即将推出!"
7+
"icon": "hammer",
8+
"title": "项目",
9+
"subtitle": "重构",
10+
"body": "分离文件和文件夹以便更好地维护。"
1111
},
1212
{
1313
"icon": "macpro.gen3.server",
@@ -19,7 +19,19 @@
1919
"icon": "arrow.triangle.pull",
2020
"title": "贡献",
2121
"subtitle": "一起",
22-
"body": "提出请求,变得更好! 🎉"
22+
"body": "提出请求,让每个人都变得更好! 🎉"
23+
}
24+
]
25+
},
26+
{
27+
"version": "6.0",
28+
"subVersion": "6.0.0",
29+
"new": [
30+
{
31+
"icon": "wineglass",
32+
"title": "玻璃",
33+
"subtitle": "效果",
34+
"body": "现已推出!"
2335
}
2436
]
2537
},

Demo/What's New?/zh-Hant.lproj/data.json

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[
22
{
3-
"version": "6.0",
4-
"subVersion": "6.0.0",
3+
"version": "6.1",
4+
"subVersion": "6.1.0",
55
"new": [
66
{
7-
"icon": "wineglass",
8-
"title": "玻璃",
9-
"subtitle": "效果",
10-
"body": "即將推出!"
7+
"icon": "hammer",
8+
"title": "專案",
9+
"subtitle": "重構",
10+
"body": "分離檔案和資料夾以便更好地維護。"
1111
},
1212
{
1313
"icon": "macpro.gen3.server",
@@ -19,7 +19,19 @@
1919
"icon": "arrow.triangle.pull",
2020
"title": "貢獻",
2121
"subtitle": "一起",
22-
"body": "提出請求,變得更好! 🎉"
22+
"body": "提出請求,讓每個人都變得更好! 🎉"
23+
}
24+
]
25+
},
26+
{
27+
"version": "6.0",
28+
"subVersion": "6.0.0",
29+
"new": [
30+
{
31+
"icon": "wineglass",
32+
"title": "玻璃",
33+
"subtitle": "效果",
34+
"body": "現已推出!"
2335
}
2436
]
2537
},

Package.swift

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ let package = Package(
1111
defaultLocalization: "en",
1212
platforms: [
1313
.iOS(.v15),
14-
.watchOS(.v8),
1514
.macOS(.v14),
1615
.visionOS(.v1),
1716
.tvOS(.v17)
@@ -22,17 +21,20 @@ let package = Package(
2221
targets: ["SwiftNEW"]),
2322
],
2423
dependencies: [
25-
.package(name: "SwiftVB", url: "https://github.com/1998code/SwiftVBKit.git", .upToNextMinor(from: "1.4.0")),
26-
.package(name: "Drops", url: "https://github.com/omaralbeik/Drops.git", .upToNextMinor(from: "1.7.0")),
27-
.package(name: "SwiftGlass", url: "https://github.com/1998code/SwiftGlass.git", .upToNextMinor(from: "1.8.0"))
24+
.package(url: "https://github.com/1998code/SwiftVBKit.git", .upToNextMinor(from: "1.4.0")),
25+
.package(url: "https://github.com/omaralbeik/Drops.git", .upToNextMinor(from: "1.7.0")),
26+
.package(url: "https://github.com/1998code/SwiftGlass.git", .upToNextMinor(from: "1.8.0"))
2827
],
2928
targets: [
3029
.target(
3130
name: "SwiftNEW",
3231
dependencies: [
33-
"SwiftVB",
34-
"Drops",
35-
"SwiftGlass"
32+
.product(name: "SwiftVB", package: "SwiftVBKit"),
33+
.product(name: "Drops", package: "Drops"),
34+
.product(name: "SwiftGlass", package: "SwiftGlass")
35+
],
36+
resources: [
37+
.process("Localizable.xcstrings")
3638
]
3739
)
3840
]

0 commit comments

Comments
 (0)