version increment to 3.7

MesserLab · Dec 15, 2021 · 16d8c56 · 16d8c56
1 parent eae542c
commit 16d8c56
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/EidosScribe/Info.plist b/EidosScribe/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.6</string>
+	<string>2.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/QtSLiM/QtSLiM.pro b/QtSLiM/QtSLiM.pro
@@ -18,7 +18,7 @@ QMAKE_INFO_PLIST = QtSLiM_Info.plist
 ICON = QtSLiM_AppIcon.icns
 QMAKE_TARGET_BUNDLE_PREFIX = "org.messerlab"
 QMAKE_BUNDLE = "SLiMgui"		# This governs the location of our prefs, which we keep under org.messerlab.SLiMgui
-VERSION = 3.6
+VERSION = 3.7
 
 docIconFiles.files = $$PWD/QtSLiM_DocIcon.icns
 docIconFiles.path = Contents/Resources

diff --git a/SLiMgui/Info.plist b/SLiMgui/Info.plist
@@ -88,7 +88,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.6</string>
+	<string>3.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/VERSIONS b/VERSIONS
@@ -8,6 +8,9 @@ The build numbers given here are visible in SLiMgui's about panel.  They are not
 
 
 development head:
+
+
+version 3.7 (Eidos version 2.7)
 	change to allow .trees files to contain unreferenced empty subpops, to allow ancestral use of subpops that are now empty (see #168)
 	disallow reuse of subpopulation ids if they have gone into the tree-sequence tables, to prevent collisions
 	change so that entries for unused subpops are not modified in population tables loaded from a tree sequence (PR #172)
@@ -90,7 +93,6 @@ development head:
 	updated to tskit 0.99.15 to try out C API 1.0 prerelease stuff
 	add [Ns$ timeUnit=NULL] parameter to initializeTreeSeq() to set the name of the tree-sequence recording time unit
 
-
 version 3.6 (build 2784; Eidos version 2.6):
 	update to JSON for Modern C++ version 3.9.1
 	add metadata= parameter to treeSeqOutput(), to support user-generated metadata on the tree sequence

diff --git a/core/slim_globals.h b/core/slim_globals.h
@@ -41,8 +41,8 @@ class Subpopulation;
 class SLiMEidosBlock;
 
 
-#define SLIM_VERSION_STRING	("3.6")
-#define SLIM_VERSION_FLOAT	(3.6)
+#define SLIM_VERSION_STRING	("3.7")
+#define SLIM_VERSION_FLOAT	(3.7)
 
 
 // This should be called once at startup to give SLiM an opportunity to initialize static state

diff --git a/eidos/eidos_globals.h b/eidos/eidos_globals.h
@@ -53,8 +53,8 @@ class EidosScript;
 class EidosToken;
 
 
-#define EIDOS_VERSION_STRING	("2.6")
-#define EIDOS_VERSION_FLOAT		(2.6)
+#define EIDOS_VERSION_STRING	("2.7")
+#define EIDOS_VERSION_FLOAT		(2.7)
 
 
 // These should be called once at startup to give Eidos an opportunity to initialize static state