Merge branch 'release/1.3.1'

ktekinay · Jan 13, 2015 · 62e8528 · 62e8528
2 parents 0115a86 + 5342ce1
commit 62e8528
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 65 deletions.
diff --git a/Kaju Admin App/Kaju Admin.xojo_project b/Kaju Admin App/Kaju Admin.xojo_project
@@ -27,12 +27,12 @@ Class=HTTPSSocket;../Kaju Classes/Kaju/HTTPSSocket.xojo_code;&h5ACDFAEB;&h114003
 AppMenuBar=MainMenuBar
 MajorVersion=1
 MinorVersion=3
-SubVersion=0
+SubVersion=1
 NonRelease=0
 Release=3
 InfoVersion=Kaju Admin
-LongVersion=v.1.3
-ShortVersion=1.3
+LongVersion=v.1.3.1
+ShortVersion=1.3.1
 WinCompanyName=MacTechnologies Consulting
 WinInternalName=
 WinProductName=

diff --git a/Kaju Admin App/WndAdmin.xojo_window b/Kaju Admin App/WndAdmin.xojo_window
@@ -202,7 +202,6 @@ Begin Window WndAdmin
       Selectable      =   False
       TabIndex        =   12
       TabPanelIndex   =   0
-      TabStop         =   True
       Text            =   "Version:"
       TextAlign       =   0
       TextColor       =   &c00000000
@@ -337,7 +336,6 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   2
          TabPanelIndex   =   1
-         TabStop         =   True
          Text            =   "Preview:"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -447,7 +445,6 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   3
          TabPanelIndex   =   2
-         TabStop         =   True
          Text            =   "Hash:"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -482,7 +479,6 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   4
          TabPanelIndex   =   2
-         TabStop         =   True
          Text            =   "URL:"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -517,7 +513,6 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   3
          TabPanelIndex   =   1
-         TabStop         =   True
          Text            =   "Release Notes (HTML):"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -627,7 +622,6 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   8
          TabPanelIndex   =   2
-         TabStop         =   True
          Text            =   "Hash:"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -662,7 +656,6 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   9
          TabPanelIndex   =   2
-         TabStop         =   True
          Text            =   "URL:"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -729,7 +722,6 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   13
          TabPanelIndex   =   2
-         TabStop         =   True
          Text            =   "Hash:"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -764,7 +756,6 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   14
          TabPanelIndex   =   2
-         TabStop         =   True
          Text            =   "URL:"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -842,7 +833,6 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   1
          TabPanelIndex   =   3
-         TabStop         =   True
          Text            =   "URL:"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -918,7 +908,7 @@ Begin Window WndAdmin
          Bold            =   False
          Border          =   True
          CueText         =   ""
-         DataField       =   "MinimumRequiriedVersion"
+         DataField       =   "MinimumRequiredVersion"
          DataSource      =   ""
          Enabled         =   False
          Format          =   ""
@@ -974,7 +964,6 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   16
          TabPanelIndex   =   2
-         TabStop         =   True
          Text            =   "Minimum Required Version:"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -1401,7 +1390,6 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   18
          TabPanelIndex   =   2
-         TabStop         =   True
          Text            =   "Executable:"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -1479,7 +1467,6 @@ Begin Window WndAdmin
          Selectable      =   False
          TabIndex        =   20
          TabPanelIndex   =   2
-         TabStop         =   True
          Text            =   "Executable:"
          TextAlign       =   0
          TextColor       =   &c00000000
@@ -1825,7 +1812,6 @@ Begin Window WndAdmin
       Selectable      =   False
       TabIndex        =   11
       TabPanelIndex   =   0
-      TabStop         =   True
       Text            =   "App Name:"
       TextAlign       =   0
       TextColor       =   &c00000000
@@ -1871,8 +1857,7 @@ Begin Window WndAdmin
       Width           =   180
    End
    Begin Timer tmrUpdateReleaseNotesPreview
-      Enabled         =   True
-      Height          =   "32"
+      Height          =   32
       Index           =   -2147483648
       InitialParent   =   ""
       Left            =   0
@@ -1882,8 +1867,7 @@ Begin Window WndAdmin
       Scope           =   2
       TabPanelIndex   =   0
       Top             =   0
-      Visible         =   True
-      Width           =   "32"
+      Width           =   32
    End
    Begin HTMLViewer hvNewWindow
       AutoDeactivate  =   True
@@ -1938,8 +1922,7 @@ Begin Window WndAdmin
       Width           =   186
    End
    Begin Timer tmrUpdateImagePreview
-      Enabled         =   True
-      Height          =   "32"
+      Height          =   32
       Index           =   -2147483648
       InitialParent   =   ""
       Left            =   20
@@ -1949,8 +1932,7 @@ Begin Window WndAdmin
       Scope           =   2
       TabPanelIndex   =   0
       Top             =   20
-      Visible         =   True
-      Width           =   "32"
+      Width           =   32
    End
    Begin Label lblPlatform
       AutoDeactivate  =   True
@@ -1974,7 +1956,6 @@ Begin Window WndAdmin
       Selectable      =   False
       TabIndex        =   6
       TabPanelIndex   =   0
-      TabStop         =   True
       Text            =   "None"
       TextAlign       =   0
       TextColor       =   &c00000000
@@ -2009,7 +1990,6 @@ Begin Window WndAdmin
       Selectable      =   False
       TabIndex        =   13
       TabPanelIndex   =   0
-      TabStop         =   True
       Text            =   "Platforms:"
       TextAlign       =   0
       TextColor       =   &c00000000

diff --git a/Kaju Classes/Kaju.xojo_code b/Kaju Classes/Kaju.xojo_code
@@ -251,7 +251,7 @@ Protected Module Kaju
 		  // Assumes that the version will have no more than 3 parts
 		  // (NN.NN.NN) and each part will max out at 999. The version
 		  // may trail with a development, alpha, or beta suffix, and that
-		  // part will max out at 999. If a final, it may trail with a build 
+		  // part will max out at 999. If a final, it may trail with a build
 		  // number.
 		  //
 		  // Examples:

diff --git a/Kaju Classes/KajuUpdateWindow.xojo_window b/Kaju Classes/KajuUpdateWindow.xojo_window
@@ -527,7 +527,7 @@ End
 
 		  tmrTimeout.Mode = Timer.ModeOff
 
-		  if Checker.QuitOnCancelIfRequired and Checker.Result = Kaju.UpdateChecker.ResultType.RequiredUpdateAvailable then
+		  if Checker.QuitOnCancelIfRequired and not Checker.DryRun and Checker.Result = Kaju.UpdateChecker.ResultType.RequiredUpdateAvailable then
 		    quit
 		  else
 		    self.Close

diff --git a/Kaju Update Test v1.kaju b/Kaju Update Test v1.kaju
@@ -7,20 +7,20 @@
       "ReleaseNotes":"<p>This is a fake update for v.1.1 (10). It will really point to a binary of 1.0. (This demonstrates the use of the optional build number for final versions.)<\/p>\n\r<p>In other words, the app will replace itself.<\/p>\n\n<p><b>NOTE<\/b>: The update will warn you that the update will require a payment. <u>THIS IS A LIE!!<\/u> It’s only set that way to test the “Requires Payment” option.<\/p>\n\n<h3>Changes<\/h3>\n<ul>\n<li>There really aren’t any.<\/li>\n<li>This is just here as a placeholder.<\/li>\n<\/ul>",
       "ImageURL":"",
       "UseTransparency":false,
-      "MinimumRequiriedVersion":"",
+      "MinimumRequiredVersion":"",
       "AppName":"Kaju Update Test",
       "RequiresPayment":true,
       "MacBinary":{
-        "Hash":"770CBE477DFB2F24040697997835CE00",
+        "Hash":"2C80536567D2B90B74F7ED56F746AA30",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Mac.zip"
       },
       "WindowsBinary":{
-        "Hash":"DAE0E76052F66DDB4784E01830A02D14",
+        "Hash":"851D6E8018EF28F7243A3E77B4F4C7EA",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Win.zip",
         "ExecutableName":"Kaju Update Test.exe"
       },
       "LinuxBinary":{
-        "Hash":"070DF4E3FC0B42F646999C613EE2B2F8",
+        "Hash":"CFD0758AD8365C6940419A52B2AB1ECC",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Linux.zip",
         "ExecutableName":"Kaju Update Test"
       }
@@ -30,20 +30,20 @@
       "ReleaseNotes":"<p>A phony development version pointing to the same binary. Meant as a placeholder to demonstrate multiple versions.<\/p>\n\n<p>Note that this version has a name change.<\/p>",
       "ImageURL":"",
       "UseTransparency":false,
-      "MinimumRequiriedVersion":"",
+      "MinimumRequiredVersion":"",
       "AppName":"New Kaju Update Test",
       "RequiresPayment":false,
       "MacBinary":{
-        "Hash":"770CBE477DFB2F24040697997835CE00",
+        "Hash":"2C80536567D2B90B74F7ED56F746AA30",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Mac.zip"
       },
       "WindowsBinary":{
-        "Hash":"DAE0E76052F66DDB4784E01830A02D14",
+        "Hash":"851D6E8018EF28F7243A3E77B4F4C7EA",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Win.zip",
         "ExecutableName":"Kaju Update Test.exe"
       },
       "LinuxBinary":{
-        "Hash":"070DF4E3FC0B42F646999C613EE2B2F8",
+        "Hash":"CFD0758AD8365C6940419A52B2AB1ECC",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Linux.zip",
         "ExecutableName":"Kaju Update Test"
       }
@@ -53,20 +53,20 @@
       "ReleaseNotes":"<p>A phony alpha pointing to the same binary. Meant as a placeholder to demonstrate multiple versions.<\/p>",
       "ImageURL":"",
       "UseTransparency":false,
-      "MinimumRequiriedVersion":"",
+      "MinimumRequiredVersion":"",
       "AppName":"Kaju Update Test",
       "RequiresPayment":false,
       "MacBinary":{
-        "Hash":"770CBE477DFB2F24040697997835CE00",
+        "Hash":"2C80536567D2B90B74F7ED56F746AA30",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Mac.zip"
       },
       "WindowsBinary":{
-        "Hash":"DAE0E76052F66DDB4784E01830A02D14",
+        "Hash":"851D6E8018EF28F7243A3E77B4F4C7EA",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Win.zip",
         "ExecutableName":"Kaju Update Test.exe"
       },
       "LinuxBinary":{
-        "Hash":"070DF4E3FC0B42F646999C613EE2B2F8",
+        "Hash":"CFD0758AD8365C6940419A52B2AB1ECC",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Linux.zip",
         "ExecutableName":"Kaju Update Test"
       }
@@ -76,7 +76,7 @@
       "ReleaseNotes":"<p>A phony beta pointing to the same binary. Meant as a placeholder to demonstrate multiple versions.<\/p>\n\n<p><b>IMPORTANT<\/b>: The URL’s for the binaries have been intentionally switched to test the hash function. Attempting to update to this version should result in an error.<\/b>",
       "ImageURL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Some_Image_beta.png",
       "UseTransparency":true,
-      "MinimumRequiriedVersion":"",
+      "MinimumRequiredVersion":"",
       "AppName":"Kaju Update Test",
       "RequiresPayment":false,
       "MacBinary":{
@@ -99,20 +99,20 @@
       "ReleaseNotes":"<p>A fake release that should never appear. (Except in Preview.)<\/p>",
       "ImageURL":"",
       "UseTransparency":false,
-      "MinimumRequiriedVersion":"",
+      "MinimumRequiredVersion":"",
       "AppName":"Kaju Update Test",
       "RequiresPayment":false,
       "MacBinary":{
-        "Hash":"770CBE477DFB2F24040697997835CE00",
+        "Hash":"2C80536567D2B90B74F7ED56F746AA30",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Mac.zip"
       },
       "WindowsBinary":{
-        "Hash":"DAE0E76052F66DDB4784E01830A02D14",
+        "Hash":"851D6E8018EF28F7243A3E77B4F4C7EA",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Win.zip",
         "ExecutableName":"Kaju Update Test.exe"
       },
       "LinuxBinary":{
-        "Hash":"070DF4E3FC0B42F646999C613EE2B2F8",
+        "Hash":"CFD0758AD8365C6940419A52B2AB1ECC",
         "URL":"http:\/\/www.mactechnologies.com\/Kaju_Test\/Kaju_Update_Test_Linux.zip",
         "ExecutableName":"Kaju Update Test"
       }

diff --git a/README.md b/README.md
@@ -349,3 +349,7 @@ Add a translation for each, then submit a pull request as outlined above.
 
 - Final versions can use the non-release number as a build number.
 - Fixed translations that were marked as "default".
+
+1.3.1 (Jan. 13, 2015)
+
+- Fixed bug that prevented MinimumRequiredVersion from working.
diff --git a/Update Test Files (Upload These)/Kaju_Update_Test_Linux.zip b/Update Test Files (Upload These)/Kaju_Update_Test_Linux.zip
diff --git a/Update Test Files (Upload These)/Kaju_Update_Test_Mac.zip b/Update Test Files (Upload These)/Kaju_Update_Test_Mac.zip
diff --git a/Update Test Files (Upload These)/Kaju_Update_Test_Win.zip b/Update Test Files (Upload These)/Kaju_Update_Test_Win.zip