Merge pull request #2347 from lixun910/v1.20

bump version to 1.20
GeoDaCenter · Sep 13, 2021 · cf7f50f · cf7f50f
2 parents 12422cb + 94d1eaf
commit cf7f50f
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/ubuntu_build.yml b/.github/workflows/ubuntu_build.yml
@@ -39,7 +39,7 @@ jobs:
 
     env:
       platform: ${{ matrix.distro }}
-      GEODA_VER: '1.18.2'
+      GEODA_VER: '1.20.0'
       TARGET_OS: ${{ matrix.pre }}
 
     # Steps represent a sequence of tasks that will be executed as part of the job

diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml
@@ -237,7 +237,7 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: GeoDa-Windows-${{ env.platform }}-installer
-          path: ${{ github.workspace }}\BuildTools\windows\GeoDa_1.18_${{ env.platform }}_Setup.exe
+          path: ${{ github.workspace }}\BuildTools\windows\GeoDa_1.20_${{ env.platform }}_Setup.exe
 
 
 

diff --git a/BuildTools/ubuntu/create_deb.sh b/BuildTools/ubuntu/create_deb.sh
@@ -19,7 +19,7 @@ if [[ $MACHINE_TYPE != 'x86_64' ]]; then
 fi
 
 if [[ $# -ne 2 ]]; then
-    echo "create_deb.sh bionic|disco|xenial 1.18"
+    echo "create_deb.sh bionic|disco|xenial 1.20"
     exit
 fi
 

diff --git a/BuildTools/ubuntu/package/DEBIAN/control b/BuildTools/ubuntu/package/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: geoda
-Version: 1.18-1xenial1
+Version: 1.20-1xenial1
 Architecture: i386
 Priority: optional
 Section: graphics

diff --git a/BuildTools/ubuntu/package/DEBIAN/control_bionic b/BuildTools/ubuntu/package/DEBIAN/control_bionic
@@ -1,5 +1,5 @@
 Package: geoda
-Version: 1.18-1bionic1
+Version: 1.20-1bionic1
 Architecture: amd64
 Priority: optional
 Section: graphics

diff --git a/BuildTools/ubuntu/package/DEBIAN/control_disco b/BuildTools/ubuntu/package/DEBIAN/control_disco
@@ -1,5 +1,5 @@
 Package: geoda
-Version: 1.18-1disco1
+Version: 1.20-1disco1
 Architecture: amd64
 Priority: optional
 Section: graphics

diff --git a/BuildTools/ubuntu/package/DEBIAN/control_focal b/BuildTools/ubuntu/package/DEBIAN/control_focal
@@ -1,5 +1,5 @@
 Package: geoda
-Version: 1.18-1focal1
+Version: 1.20-1focal1
 Architecture: amd64
 Priority: optional
 Section: graphics

diff --git a/BuildTools/ubuntu/package/DEBIAN/control_xenial b/BuildTools/ubuntu/package/DEBIAN/control_xenial
@@ -1,5 +1,5 @@
 Package: geoda
-Version: 1.18-1xenial1
+Version: 1.20-1xenial1
 Architecture: amd64
 Priority: optional
 Section: graphics

diff --git a/BuildTools/ubuntu/package/usr/share/applications/GeoDa.desktop b/BuildTools/ubuntu/package/usr/share/applications/GeoDa.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=1.18
+Version=1.20
 Type=Application
 Name=GeoDa
 GenericName=GeoDa Software

diff --git a/BuildTools/windows/installer/32bit/GeoDa.iss b/BuildTools/windows/installer/32bit/GeoDa.iss
@@ -5,7 +5,7 @@ AppPublisherURL=https://spatial.uchiago.edu/
 AppSupportURL=https://spatial.uchiago.edu/
 AppUpdatesURL=https://spatial.uchiago.edu/
 AppSupportPhone=(480)965-7533
-AppVersion=1.18
+AppVersion=1.20
 DefaultDirName={pf}\GeoDa Software
 DefaultGroupName=GeoDa Software
 ; Since no icons will be created in "{group}", we don't need the wizard
@@ -15,7 +15,7 @@ UninstallDisplayIcon={app}\GeoDa.exe
 Compression=lzma2
 SolidCompression=yes
 OutputDir=..\..
-OutputBaseFilename=GeoDa_1.18_x86_Setup
+OutputBaseFilename=GeoDa_1.20_x86_Setup
 ;OutputDir=userdocs:Inno Setup Examples Output
 
 ChangesAssociations=yes

diff --git a/BuildTools/windows/installer/64bit/GeoDa.iss b/BuildTools/windows/installer/64bit/GeoDa.iss
@@ -5,7 +5,7 @@ AppPublisherURL=https://spatial.uchiago.edu/
 AppSupportURL=https://spatial.uchiago.edu/
 AppUpdatesURL=https://spatial.uchiago.edu/
 AppSupportPhone=(480)965-7533
-AppVersion=1.18
+AppVersion=1.20
 DefaultDirName={pf}\GeoDa Software
 DefaultGroupName=GeoDa Software
 ; Since no icons will be created in "{group}", we don't need the wizard
@@ -15,7 +15,7 @@ UninstallDisplayIcon={app}\GeoDa.exe
 Compression=lzma2
 SolidCompression=yes
 OutputDir=..\..
-OutputBaseFilename=GeoDa_1.18_x64_Setup
+OutputBaseFilename=GeoDa_1.20_x64_Setup
 ;OutputDir=userdocs:Inno Setup Examples Output
 
 ; "ArchitecturesAllowed=x64" specifies that Setup cannot run on