From 54325e24dc11bf5ecfb1e17ed5149d6c4cb7b9d6 Mon Sep 17 00:00:00 2001 From: sciencewhiz Date: Tue, 31 Dec 2024 20:25:11 -0800 Subject: [PATCH] Update projectYear to 2025 (#740) --- .../resources/gradle/c/.wpilib/wpilib_preferences.json | 2 +- .../resources/gradle/cpp/.wpilib/wpilib_preferences.json | 2 +- .../resources/gradle/cppdt/.wpilib/wpilib_preferences.json | 2 +- .../gradle/cppromi/.wpilib/wpilib_preferences.json | 2 +- .../resources/gradle/cppxrp/.wpilib/wpilib_preferences.json | 2 +- .../resources/gradle/java/.wpilib/wpilib_preferences.json | 2 +- .../resources/gradle/javadt/.wpilib/wpilib_preferences.json | 2 +- .../gradle/javaromi/.wpilib/wpilib_preferences.json | 2 +- .../gradle/javaxrp/.wpilib/wpilib_preferences.json | 2 +- vscode-wpilib/src/extension.ts | 6 +++--- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/vscode-wpilib/resources/gradle/c/.wpilib/wpilib_preferences.json b/vscode-wpilib/resources/gradle/c/.wpilib/wpilib_preferences.json index db78cad0..36975e70 100644 --- a/vscode-wpilib/resources/gradle/c/.wpilib/wpilib_preferences.json +++ b/vscode-wpilib/resources/gradle/c/.wpilib/wpilib_preferences.json @@ -1,6 +1,6 @@ { "enableCppIntellisense": true, "currentLanguage": "cpp", - "projectYear": "2025beta", + "projectYear": "2025", "teamNumber": -1 } diff --git a/vscode-wpilib/resources/gradle/cpp/.wpilib/wpilib_preferences.json b/vscode-wpilib/resources/gradle/cpp/.wpilib/wpilib_preferences.json index db78cad0..36975e70 100644 --- a/vscode-wpilib/resources/gradle/cpp/.wpilib/wpilib_preferences.json +++ b/vscode-wpilib/resources/gradle/cpp/.wpilib/wpilib_preferences.json @@ -1,6 +1,6 @@ { "enableCppIntellisense": true, "currentLanguage": "cpp", - "projectYear": "2025beta", + "projectYear": "2025", "teamNumber": -1 } diff --git a/vscode-wpilib/resources/gradle/cppdt/.wpilib/wpilib_preferences.json b/vscode-wpilib/resources/gradle/cppdt/.wpilib/wpilib_preferences.json index db78cad0..36975e70 100644 --- a/vscode-wpilib/resources/gradle/cppdt/.wpilib/wpilib_preferences.json +++ b/vscode-wpilib/resources/gradle/cppdt/.wpilib/wpilib_preferences.json @@ -1,6 +1,6 @@ { "enableCppIntellisense": true, "currentLanguage": "cpp", - "projectYear": "2025beta", + "projectYear": "2025", "teamNumber": -1 } diff --git a/vscode-wpilib/resources/gradle/cppromi/.wpilib/wpilib_preferences.json b/vscode-wpilib/resources/gradle/cppromi/.wpilib/wpilib_preferences.json index db78cad0..36975e70 100644 --- a/vscode-wpilib/resources/gradle/cppromi/.wpilib/wpilib_preferences.json +++ b/vscode-wpilib/resources/gradle/cppromi/.wpilib/wpilib_preferences.json @@ -1,6 +1,6 @@ { "enableCppIntellisense": true, "currentLanguage": "cpp", - "projectYear": "2025beta", + "projectYear": "2025", "teamNumber": -1 } diff --git a/vscode-wpilib/resources/gradle/cppxrp/.wpilib/wpilib_preferences.json b/vscode-wpilib/resources/gradle/cppxrp/.wpilib/wpilib_preferences.json index db78cad0..36975e70 100644 --- a/vscode-wpilib/resources/gradle/cppxrp/.wpilib/wpilib_preferences.json +++ b/vscode-wpilib/resources/gradle/cppxrp/.wpilib/wpilib_preferences.json @@ -1,6 +1,6 @@ { "enableCppIntellisense": true, "currentLanguage": "cpp", - "projectYear": "2025beta", + "projectYear": "2025", "teamNumber": -1 } diff --git a/vscode-wpilib/resources/gradle/java/.wpilib/wpilib_preferences.json b/vscode-wpilib/resources/gradle/java/.wpilib/wpilib_preferences.json index 37b85b78..84acfe02 100644 --- a/vscode-wpilib/resources/gradle/java/.wpilib/wpilib_preferences.json +++ b/vscode-wpilib/resources/gradle/java/.wpilib/wpilib_preferences.json @@ -1,6 +1,6 @@ { "enableCppIntellisense": false, "currentLanguage": "java", - "projectYear": "2025beta", + "projectYear": "2025", "teamNumber": -1 } diff --git a/vscode-wpilib/resources/gradle/javadt/.wpilib/wpilib_preferences.json b/vscode-wpilib/resources/gradle/javadt/.wpilib/wpilib_preferences.json index 37b85b78..84acfe02 100644 --- a/vscode-wpilib/resources/gradle/javadt/.wpilib/wpilib_preferences.json +++ b/vscode-wpilib/resources/gradle/javadt/.wpilib/wpilib_preferences.json @@ -1,6 +1,6 @@ { "enableCppIntellisense": false, "currentLanguage": "java", - "projectYear": "2025beta", + "projectYear": "2025", "teamNumber": -1 } diff --git a/vscode-wpilib/resources/gradle/javaromi/.wpilib/wpilib_preferences.json b/vscode-wpilib/resources/gradle/javaromi/.wpilib/wpilib_preferences.json index 37b85b78..84acfe02 100644 --- a/vscode-wpilib/resources/gradle/javaromi/.wpilib/wpilib_preferences.json +++ b/vscode-wpilib/resources/gradle/javaromi/.wpilib/wpilib_preferences.json @@ -1,6 +1,6 @@ { "enableCppIntellisense": false, "currentLanguage": "java", - "projectYear": "2025beta", + "projectYear": "2025", "teamNumber": -1 } diff --git a/vscode-wpilib/resources/gradle/javaxrp/.wpilib/wpilib_preferences.json b/vscode-wpilib/resources/gradle/javaxrp/.wpilib/wpilib_preferences.json index 37b85b78..84acfe02 100644 --- a/vscode-wpilib/resources/gradle/javaxrp/.wpilib/wpilib_preferences.json +++ b/vscode-wpilib/resources/gradle/javaxrp/.wpilib/wpilib_preferences.json @@ -1,6 +1,6 @@ { "enableCppIntellisense": false, "currentLanguage": "java", - "projectYear": "2025beta", + "projectYear": "2025", "teamNumber": -1 } diff --git a/vscode-wpilib/src/extension.ts b/vscode-wpilib/src/extension.ts index b7fd1a58..dd655083 100644 --- a/vscode-wpilib/src/extension.ts +++ b/vscode-wpilib/src/extension.ts @@ -289,9 +289,9 @@ async function handleAfterTrusted( continue; } - if (prefs.getProjectYear() !== '2025beta') { + if (prefs.getProjectYear() !== '2025') { const importPersistantState = new PersistentFolderState( - 'wpilib.2025betapersist', + 'wpilib.2025persist', false, w.uri.fsPath ); @@ -299,7 +299,7 @@ async function handleAfterTrusted( const upgradeResult = await vscode.window.showInformationMessage( i18n( 'message', - 'This project is not compatible with this version of the extension. Would you like to import this project into 2025beta?' + 'This project is not compatible with this version of the extension. Would you like to import this project into 2025?' ), { modal: true,