From 7cda778eb27a458a4f3a2fc9405c9d2bf61ad2e8 Mon Sep 17 00:00:00 2001
From: Neil Brown <neil.c.c.brown@kcl.ac.uk>
Date: Thu, 19 Oct 2023 18:09:45 +0100
Subject: [PATCH] Added missing GUID for Greenfoot 3.8.1, and now committing
 results of updateVersionNumber task.

---
 bluej/package/winlaunch/gfmanifest.xml       | 2 +-
 bluej/package/winlaunch/greenfoot-version.rc | 8 ++++----
 bluej/package/winsetup/greenfoot.wxs         | 4 ++--
 boot/src/main/java/bluej/Boot.java           | 4 ++--
 greenfoot/doc/Greenfoot-README.txt           | 2 +-
 version.properties                           | 1 +
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/bluej/package/winlaunch/gfmanifest.xml b/bluej/package/winlaunch/gfmanifest.xml
index 7a8264ceb..7d56dfd01 100644
--- a/bluej/package/winlaunch/gfmanifest.xml
+++ b/bluej/package/winlaunch/gfmanifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
   <!-- Note: the following line is matched by a regex in the build file -->
-  <assemblyIdentity version="3.8.0.0"
+  <assemblyIdentity version="3.8.1.0"
      processorArchitecture="X86"
      name="Greenfoot"
      type="win32"/> 
diff --git a/bluej/package/winlaunch/greenfoot-version.rc b/bluej/package/winlaunch/greenfoot-version.rc
index 60ff88d25..75d9a4cee 100644
--- a/bluej/package/winlaunch/greenfoot-version.rc
+++ b/bluej/package/winlaunch/greenfoot-version.rc
@@ -1,5 +1,5 @@
-FILEVERSION 3,8,0,0
-PRODUCTVERSION 3,8,0,0
+FILEVERSION 3,8,1,0
+PRODUCTVERSION 3,8,1,0
 BEGIN
 	BLOCK "StringFileInfo"
 	BEGIN
@@ -7,11 +7,11 @@ BEGIN
 		BEGIN
 			VALUE "CompanyName", "BlueJ group"
 			VALUE "FileDescription", "Greenfoot Launcher"
-			VALUE "FileVersion", "3.8.0"
+			VALUE "FileVersion", "3.8.1"
 			VALUE "InternalName", "greenfoot"
 			VALUE "OriginalFilename", "greenfoot.exe"
 			VALUE "ProductName", "Greenfoot"
-			VALUE "ProductVersion", "3.8.0"
+			VALUE "ProductVersion", "3.8.1"
 		END
 	END
 END
diff --git a/bluej/package/winsetup/greenfoot.wxs b/bluej/package/winsetup/greenfoot.wxs
index 79bec7f08..e157785f4 100644
--- a/bluej/package/winsetup/greenfoot.wxs
+++ b/bluej/package/winsetup/greenfoot.wxs
@@ -5,7 +5,7 @@
      If you get a build failure here with a message about ${greenfoot-3.1.0} or similar not being a legal
       guid value, then it is because you failed to make a new GUID for this version: see the
       update-version-number task in ant for details on what to do. -->
-<Product Version='3.8.0' Id='41ad39a1-7328-454a-847b-814b0d008df0'
+<Product Version='3.8.1' Id='e9f90c70-f233-4193-b697-6830fc31fcbd'
     Name='Greenfoot' UpgradeCode='3ec7b829-9e53-4132-b2bf-fb7d4c08aebc'
     Language='1033' Codepage='1252' Manufacturer='Greenfoot Team'>
     
@@ -23,7 +23,7 @@
     <Property Id="ALLUSERS" Secure="yes" />
     
     <Property Id="SOFTWARE" Value="Greenfoot"/>
-    <Property Id="SOFTWAREVERSION" Value="3.8.0"/>
+    <Property Id="SOFTWAREVERSION" Value="3.8.1"/>
     <Property Id="SOFTWAREPROJECTEXT" Value="greenfoot"/>
     <Property Id="SOFTWAREARCHIVEEXT" Value="gfar"/>
     <!-- Define all the necessary GUIDs here, to make sure they are different from BlueJ -->
diff --git a/boot/src/main/java/bluej/Boot.java b/boot/src/main/java/bluej/Boot.java
index 4aec4972c..1aad0e2fd 100644
--- a/boot/src/main/java/bluej/Boot.java
+++ b/boot/src/main/java/bluej/Boot.java
@@ -60,8 +60,8 @@ public class Boot
     // version.properties file and then the :boot:updateVersionNumber task should be
     // executed to change them here and elsewhere where needed.
     public static final String BLUEJ_VERSION = "5.2.1";
-    public static final String GREENFOOT_VERSION = "3.8.0";
-    public static final String GREENFOOT_API_VERSION = "3.0.0";
+    public static final String GREENFOOT_VERSION = "3.8.1";
+    public static final String GREENFOOT_API_VERSION = "3.1.0";
 
     public static final String BLUEJ_VERSION_TITLE = "BlueJ " + BLUEJ_VERSION;
     
diff --git a/greenfoot/doc/Greenfoot-README.txt b/greenfoot/doc/Greenfoot-README.txt
index 4deb7bc5a..23eadc5b9 100644
--- a/greenfoot/doc/Greenfoot-README.txt
+++ b/greenfoot/doc/Greenfoot-README.txt
@@ -1,4 +1,4 @@
-Greenfoot version: 3.8.0
+Greenfoot version: 3.8.1
 
 Information about Greenfoot
 -----------------------
diff --git a/version.properties b/version.properties
index 7e9a2f427..0cf47e0e9 100644
--- a/version.properties
+++ b/version.properties
@@ -66,3 +66,4 @@ greenfoot-3.6.1=ce3160a8-9e99-48a9-99fc-96796e162635
 greenfoot-3.7.0=c835680c-c79d-4285-9107-7f25cab1bbcd
 greenfoot-3.7.1=54bbe388-bd06-4007-8da6-2da5dbdf2174
 greenfoot-3.8.0=41ad39a1-7328-454a-847b-814b0d008df0
+greenfoot-3.8.1=e9f90c70-f233-4193-b697-6830fc31fcbd