Skip to content

Commit 75cbdfd

Browse files
bummoblizardbummoblizard
authored
Merge pull request #1263 from bummoblizard/xcode-26
Xcode 26
2 parents 881d1d2 + 5209fd2 commit 75cbdfd

30 files changed

+73
-148
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
JUDGE0_KEY: ""
4040
JUDGE0_ENDPOINT: ""
4141
DISTRIBUTE_EXTERNAL: "true"
42-
XCODE_PATH: "/Applications/Xcode_16.4.app"
42+
XCODE_PATH: "/Applications/Xcode_26.0.app"
4343

4444
- name: Upload Artifact
4545
uses: actions/upload-artifact@v4

‎.github/workflows/production.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ jobs:
3737
JUDGE0_KEY: "${{ secrets.JUDGE0_KEY }}"
3838
JUDGE0_ENDPOINT: "${{ secrets.JUDGE0_ENDPOINT }}"
3939
DISTRIBUTE_EXTERNAL: "false"
40-
XCODE_PATH: "/Applications/Xcode_16.4.app"
40+
XCODE_PATH: "/Applications/Xcode_26.0.app"

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
- name: Unit Tests
1818
run: fastlane tests
1919
env:
20-
XCODE_PATH: "/Applications/Xcode_16.4.app"
20+
XCODE_PATH: "/Applications/Xcode_26.0.app"

‎Code.xcodeproj/project.pbxproj‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,8 @@
551551
9474D2952B6B461E00CCC530 /* MonacoImplementation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9474D2932B6B461E00CCC530 /* MonacoImplementation.swift */; };
552552
9474D2972B6B4B1300CCC530 /* EditorImplemenationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9474D2962B6B4B1300CCC530 /* EditorImplemenationView.swift */; };
553553
9474D2982B6B4B1300CCC530 /* EditorImplemenationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9474D2962B6B4B1300CCC530 /* EditorImplemenationView.swift */; };
554+
947515E42E7E886A00822B33 /* Iconv2.icon in Resources */ = {isa = PBXBuildFile; fileRef = 947515E32E7E886A00822B33 /* Iconv2.icon */; };
555+
947515E52E7E886A00822B33 /* Iconv2.icon in Resources */ = {isa = PBXBuildFile; fileRef = 947515E32E7E886A00822B33 /* Iconv2.icon */; };
554556
94795C452931489C0057C12F /* ActivityBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94795C442931489C0057C12F /* ActivityBar.swift */; };
555557
94795C462931489C0057C12F /* ActivityBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94795C442931489C0057C12F /* ActivityBar.swift */; };
556558
94795C4829314A0A0057C12F /* CompactSidebar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94795C4729314A0A0057C12F /* CompactSidebar.swift */; };
@@ -1824,6 +1826,7 @@
18241826
9474D2902B6B454900CCC530 /* EditorImplementation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorImplementation.swift; sourceTree = "<group>"; };
18251827
9474D2932B6B461E00CCC530 /* MonacoImplementation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MonacoImplementation.swift; sourceTree = "<group>"; };
18261828
9474D2962B6B4B1300CCC530 /* EditorImplemenationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditorImplemenationView.swift; sourceTree = "<group>"; };
1829+
947515E32E7E886A00822B33 /* Iconv2.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = Iconv2.icon; sourceTree = "<group>"; };
18271830
94795C442931489C0057C12F /* ActivityBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActivityBar.swift; sourceTree = "<group>"; };
18281831
94795C4729314A0A0057C12F /* CompactSidebar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompactSidebar.swift; sourceTree = "<group>"; };
18291832
94795C4A293259080057C12F /* Encoding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Encoding.swift; sourceTree = "<group>"; };
@@ -2269,6 +2272,7 @@
22692272
94A5682D257CC367008A6530 /* Localization */,
22702273
94A777AE257B678A008FE7B2 /* Extensions */,
22712274
94A77799257ABC16008FE7B2 /* Utilities */,
2275+
947515E32E7E886A00822B33 /* Iconv2.icon */,
22722276
944EEBF32563C381009D77FE /* CodeApp.swift */,
22732277
944EEBF72563C386009D77FE /* Assets.xcassets */,
22742278
94A56834257CC60E008A6530 /* LaunchScreen.storyboard */,
@@ -3487,6 +3491,7 @@
34873491
941969A0280316C7008AAEB2 /* commandDictionary.plist in Resources */,
34883492
941969A1280316C7008AAEB2 /* ClangLib in Resources */,
34893493
941969A2280316C7008AAEB2 /* Settings.bundle in Resources */,
3494+
947515E42E7E886A00822B33 /* Iconv2.icon in Resources */,
34903495
941969A3280316C7008AAEB2 /* extraCommandsDictionary.plist in Resources */,
34913496
941969A4280316C7008AAEB2 /* npm.bundle in Resources */,
34923497
941969A6280316C7008AAEB2 /* terminal.bundle in Resources */,
@@ -3515,6 +3520,7 @@
35153520
files = (
35163521
9424437F2C6F2DF100BC862F /* python-lsp in Resources */,
35173522
94127C40280335C8008C7F82 /* Themes in Resources */,
3523+
947515E52E7E886A00822B33 /* Iconv2.icon in Resources */,
35183524
944EEBFB2563C386009D77FE /* Preview Assets.xcassets in Resources */,
35193525
94A56830257CC3A1008A6530 /* Localizable.strings in Resources */,
35203526
94252059263E103E0029427A /* InfoPlist.strings in Resources */,
@@ -4011,7 +4017,7 @@
40114017
94196B16280316C7008AAEB2 /* Debug */ = {
40124018
isa = XCBuildConfiguration;
40134019
buildSettings = {
4014-
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
4020+
ASSETCATALOG_COMPILER_APPICON_NAME = Iconv2;
40154021
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
40164022
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
40174023
CLANG_ENABLE_MODULES = YES;
@@ -4039,7 +4045,7 @@
40394045
"@executable_path/Frameworks",
40404046
);
40414047
LIBRARY_SEARCH_PATHS = "$(inherited)";
4042-
MARKETING_VERSION = 1.10.4;
4048+
MARKETING_VERSION = 1.11.0;
40434049
OTHER_SWIFT_FLAGS = "-Xcc -Wno-incomplete-umbrella";
40444050
PRODUCT_BUNDLE_IDENTIFIER = "thebaselab.VS-Code";
40454051
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -4058,7 +4064,7 @@
40584064
94196B17280316C7008AAEB2 /* Release */ = {
40594065
isa = XCBuildConfiguration;
40604066
buildSettings = {
4061-
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
4067+
ASSETCATALOG_COMPILER_APPICON_NAME = Iconv2;
40624068
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
40634069
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
40644070
CLANG_ENABLE_MODULES = YES;
@@ -4087,7 +4093,7 @@
40874093
"@executable_path/Frameworks",
40884094
);
40894095
LIBRARY_SEARCH_PATHS = "$(inherited)";
4090-
MARKETING_VERSION = 1.10.4;
4096+
MARKETING_VERSION = 1.11.0;
40914097
OTHER_SWIFT_FLAGS = "-Xcc -Wno-incomplete-umbrella";
40924098
PRODUCT_BUNDLE_IDENTIFIER = "thebaselab.VS-Code";
40934099
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -4297,7 +4303,7 @@
42974303
isa = XCBuildConfiguration;
42984304
buildSettings = {
42994305
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
4300-
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
4306+
ASSETCATALOG_COMPILER_APPICON_NAME = Iconv2;
43014307
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
43024308
CLANG_ENABLE_MODULES = YES;
43034309
CODE_SIGN_ENTITLEMENTS = "Code App.entitlements";
@@ -4324,7 +4330,7 @@
43244330
"@executable_path/Frameworks",
43254331
);
43264332
LIBRARY_SEARCH_PATHS = "$(inherited)";
4327-
MARKETING_VERSION = 1.10.4;
4333+
MARKETING_VERSION = 1.11.0;
43284334
OTHER_SWIFT_FLAGS = "-Xcc -Wno-incomplete-umbrella";
43294335
PRODUCT_BUNDLE_IDENTIFIER = "thebaselab.VS-Code";
43304336
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -4343,7 +4349,7 @@
43434349
isa = XCBuildConfiguration;
43444350
buildSettings = {
43454351
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
4346-
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
4352+
ASSETCATALOG_COMPILER_APPICON_NAME = Iconv2;
43474353
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
43484354
CLANG_ENABLE_MODULES = YES;
43494355
CODE_SIGN_ENTITLEMENTS = "Code App.entitlements";
@@ -4371,7 +4377,7 @@
43714377
"@executable_path/Frameworks",
43724378
);
43734379
LIBRARY_SEARCH_PATHS = "$(inherited)";
4374-
MARKETING_VERSION = 1.10.4;
4380+
MARKETING_VERSION = 1.11.0;
43754381
OTHER_SWIFT_FLAGS = "-Xcc -Wno-incomplete-umbrella";
43764382
PRODUCT_BUNDLE_IDENTIFIER = "thebaselab.VS-Code";
43774383
PRODUCT_NAME = "$(TARGET_NAME)";

‎CodeApp/Assets.xcassets/AppIcon.appiconset/Contents.json‎

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

‎CodeApp/Assets.xcassets/AppIcon.appiconset/[email protected]‎

-370 Bytes
Binary file not shown.

‎CodeApp/Assets.xcassets/AppIcon.appiconset/[email protected]‎

-617 Bytes
Binary file not shown.

‎CodeApp/Assets.xcassets/AppIcon.appiconset/[email protected]‎

-818 Bytes
Binary file not shown.

‎CodeApp/Assets.xcassets/AppIcon.appiconset/[email protected]‎

-528 Bytes
Binary file not shown.

‎CodeApp/Assets.xcassets/AppIcon.appiconset/[email protected]‎

-840 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)