diff --git a/.github/workflows/osx_build.yml b/.github/workflows/osx_build.yml index 6a5d41af4..869d9da1b 100644 --- a/.github/workflows/osx_build.yml +++ b/.github/workflows/osx_build.yml @@ -26,7 +26,7 @@ jobs: if: ${{ !contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') }} env: - GEODA_VER: '1.20.0' + GEODA_VER: '1.22.0' # Steps represent a sequence of tasks that will be executed as part of the job diff --git a/.github/workflows/ubuntu_build.yml b/.github/workflows/ubuntu_build.yml index b48f64333..f581bd985 100644 --- a/.github/workflows/ubuntu_build.yml +++ b/.github/workflows/ubuntu_build.yml @@ -39,7 +39,7 @@ jobs: env: platform: ${{ matrix.distro }} - GEODA_VER: '1.20.0' + GEODA_VER: '1.22.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 index 7a9915dd2..ace964701 100644 --- a/.github/workflows/windows_build.yml +++ b/.github/workflows/windows_build.yml @@ -239,9 +239,9 @@ jobs: - uses: actions/upload-artifact@v2 with: name: GeoDa-Windows-${{ env.platform }}-installer - path: ${{ github.workspace }}\BuildTools\windows\GeoDa_1.20_${{ env.platform }}_Setup.exe + path: ${{ github.workspace }}\BuildTools\windows\GeoDa_1.22_${{ env.platform }}_Setup.exe - uses: actions/upload-artifact@v2 with: name: GeoDa-Windows7+-${{ env.platform }}-installer - path: ${{ github.workspace }}\BuildTools\windows\GeoDa_1.20_win7+${{ env.platform }}_Setup.exe + path: ${{ github.workspace }}\BuildTools\windows\GeoDa_1.22_win7+${{ env.platform }}_Setup.exe diff --git a/BuildTools/macosx/GeoDa-GDAL-Info.plist b/BuildTools/macosx/GeoDa-GDAL-Info.plist index 65c0a91a4..8702a1cef 100644 --- a/BuildTools/macosx/GeoDa-GDAL-Info.plist +++ b/BuildTools/macosx/GeoDa-GDAL-Info.plist @@ -23,9 +23,9 @@ CFBundleSignature lgeoda CFBundleVersion - 1.20.0.46 + 1.22.0.0 CFBundleShortVersionString - 1.20.0.46 + 1.22.0.0 DTCompiler 4.2 DTPlatformBuild diff --git a/BuildTools/ubuntu/create_deb.sh b/BuildTools/ubuntu/create_deb.sh index 493e7753c..537b512a5 100755 --- 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.20" + echo "create_deb.sh bionic|disco|xenial 1.22" exit fi diff --git a/BuildTools/ubuntu/package/DEBIAN/control b/BuildTools/ubuntu/package/DEBIAN/control index e03da62ae..b6ff9aa98 100644 --- a/BuildTools/ubuntu/package/DEBIAN/control +++ b/BuildTools/ubuntu/package/DEBIAN/control @@ -1,5 +1,5 @@ Package: geoda -Version: 1.20-1xenial1 +Version: 1.22-1xenial1 Architecture: i386 Priority: optional Section: graphics diff --git a/BuildTools/ubuntu/package/DEBIAN/control_bionic b/BuildTools/ubuntu/package/DEBIAN/control_bionic index 7a1c879c6..58775b925 100644 --- a/BuildTools/ubuntu/package/DEBIAN/control_bionic +++ b/BuildTools/ubuntu/package/DEBIAN/control_bionic @@ -1,5 +1,5 @@ Package: geoda -Version: 1.20-1bionic1 +Version: 1.22-1bionic1 Architecture: amd64 Priority: optional Section: graphics diff --git a/BuildTools/ubuntu/package/DEBIAN/control_disco b/BuildTools/ubuntu/package/DEBIAN/control_disco index fc137e780..6503c11eb 100644 --- a/BuildTools/ubuntu/package/DEBIAN/control_disco +++ b/BuildTools/ubuntu/package/DEBIAN/control_disco @@ -1,5 +1,5 @@ Package: geoda -Version: 1.20-1disco1 +Version: 1.22-1disco1 Architecture: amd64 Priority: optional Section: graphics diff --git a/BuildTools/ubuntu/package/DEBIAN/control_focal b/BuildTools/ubuntu/package/DEBIAN/control_focal index b659ec7b3..a802760d6 100644 --- a/BuildTools/ubuntu/package/DEBIAN/control_focal +++ b/BuildTools/ubuntu/package/DEBIAN/control_focal @@ -1,5 +1,5 @@ Package: geoda -Version: 1.20-1focal1 +Version: 1.22-1focal1 Architecture: amd64 Priority: optional Section: graphics diff --git a/BuildTools/ubuntu/package/DEBIAN/control_xenial b/BuildTools/ubuntu/package/DEBIAN/control_xenial index d7368ee70..909a5288c 100644 --- a/BuildTools/ubuntu/package/DEBIAN/control_xenial +++ b/BuildTools/ubuntu/package/DEBIAN/control_xenial @@ -1,5 +1,5 @@ Package: geoda -Version: 1.20-1xenial1 +Version: 1.22-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 index 04084d418..660350246 100644 --- 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.20 +Version=1.22 Type=Application Name=GeoDa GenericName=GeoDa Software diff --git a/BuildTools/windows/installer/32bit/GeoDa-win7+.iss b/BuildTools/windows/installer/32bit/GeoDa-win7+.iss index 17df7900a..08bfe2439 100644 --- a/BuildTools/windows/installer/32bit/GeoDa-win7+.iss +++ b/BuildTools/windows/installer/32bit/GeoDa-win7+.iss @@ -5,7 +5,7 @@ AppPublisherURL=https://spatial.uchicago.edu/ AppSupportURL=https://spatial.uchicago.edu/ AppUpdatesURL=https://spatial.uchicago.edu/ AppSupportPhone=(480)965-7533 -AppVersion=1.20 +AppVersion=1.22 DefaultDirName={pf}\GeoDa 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.20_win7+x86_Setup +OutputBaseFilename=GeoDa_1.22_win7+x86_Setup ;OutputDir=userdocs:Inno Setup Examples Output ChangesAssociations=yes diff --git a/BuildTools/windows/installer/32bit/GeoDa.iss b/BuildTools/windows/installer/32bit/GeoDa.iss index 28bb55861..2a1a27d20 100644 --- a/BuildTools/windows/installer/32bit/GeoDa.iss +++ b/BuildTools/windows/installer/32bit/GeoDa.iss @@ -5,7 +5,7 @@ AppPublisherURL=https://spatial.uchicago.edu/ AppSupportURL=https://spatial.uchicago.edu/ AppUpdatesURL=https://spatial.uchicago.edu/ AppSupportPhone=(480)965-7533 -AppVersion=1.20 +AppVersion=1.22 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.20_x86_Setup +OutputBaseFilename=GeoDa_1.22_x86_Setup ;OutputDir=userdocs:Inno Setup Examples Output ChangesAssociations=yes diff --git a/BuildTools/windows/installer/64bit/GeoDa-win7+.iss b/BuildTools/windows/installer/64bit/GeoDa-win7+.iss index b6a7815a9..e10f41ce1 100644 --- a/BuildTools/windows/installer/64bit/GeoDa-win7+.iss +++ b/BuildTools/windows/installer/64bit/GeoDa-win7+.iss @@ -5,7 +5,7 @@ AppPublisherURL=https://spatial.uchicago.edu/ AppSupportURL=https://spatial.uchicago.edu/ AppUpdatesURL=https://spatial.uchicago.edu/ AppSupportPhone=(480)965-7533 -AppVersion=1.20 +AppVersion=1.22 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.20_win7+x64_Setup +OutputBaseFilename=GeoDa_1.22_win7+x64_Setup ;OutputDir=userdocs:Inno Setup Examples Output ; "ArchitecturesAllowed=x64" specifies that Setup cannot run on diff --git a/BuildTools/windows/installer/64bit/GeoDa.iss b/BuildTools/windows/installer/64bit/GeoDa.iss index e1f8a2541..2c208677e 100644 --- a/BuildTools/windows/installer/64bit/GeoDa.iss +++ b/BuildTools/windows/installer/64bit/GeoDa.iss @@ -5,7 +5,7 @@ AppPublisherURL=https://spatial.uchicago.edu/ AppSupportURL=https://spatial.uchicago.edu/ AppUpdatesURL=https://spatial.uchicago.edu/ AppSupportPhone=(480)965-7533 -AppVersion=1.20 +AppVersion=1.22 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.20_x64_Setup +OutputBaseFilename=GeoDa_1.22_x64_Setup ;OutputDir=userdocs:Inno Setup Examples Output ; "ArchitecturesAllowed=x64" specifies that Setup cannot run on