Update projectYear to 2025 (#740)

sciencewhiz · web-flow · commit 54325e24dc11 · 2024-12-31T20:25:11.000-08:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -289,17 +289,17 @@ async function handleAfterTrusted(
           continue;
         }
 
-        if (prefs.getProjectYear() !== '2025beta') {
+        if (prefs.getProjectYear() !== '2025') {
           const importPersistantState = new PersistentFolderState(
-            'wpilib.2025betapersist',
+            'wpilib.2025persist',
             false,
             w.uri.fsPath
           );
           if (importPersistantState.Value === false) {
             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,

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"enableCppIntellisense": true,`
`3`	`3`	`"currentLanguage": "cpp",`
`4`		`- "projectYear": "2025beta",`
	`4`	`+ "projectYear": "2025",`
`5`	`5`	`"teamNumber": -1`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"enableCppIntellisense": false,`
`3`	`3`	`"currentLanguage": "java",`
`4`		`- "projectYear": "2025beta",`
	`4`	`+ "projectYear": "2025",`
`5`	`5`	`"teamNumber": -1`
`6`	`6`	`}`