Merge pull request #45 from Justyna-JustCode/task/38_semantic-versioning

#38: Change version to 1.1.0
Justyna-JustCode · May 19, 2022 · b461912 · b461912
2 parents a242322 + 2197ef2
commit b461912
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Resource.rc b/Resource.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,7,0
- PRODUCTVERSION 1,0,7,0
+ FILEVERSION 1,1,0,0
+ PRODUCTVERSION 1,1,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -69,12 +69,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "JustCode"
             VALUE "FileDescription", "Resto is a simple application to control work time and breaks."
-            VALUE "FileVersion", "1.0.7.0"
+            VALUE "FileVersion", "1.1.0.0"
             VALUE "InternalName", "Resto.exe"
             VALUE "LegalCopyright", "Copyright (C) 2022"
             VALUE "OriginalFilename", "Resto.exe"
             VALUE "ProductName", "Resto"
-            VALUE "ProductVersion", "1.0.7.0"
+            VALUE "ProductVersion", "1.1.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/appInfo.cmake b/appInfo.cmake
@@ -2,7 +2,7 @@
 set(APP_NAME "Resto")
 set(APP_DESCRIPTION "A small application for work time management")
 
-set(APP_VERSION 1.0.7)
+set(APP_VERSION 1.1.0)
 execute_process(COMMAND git --git-dir ${CMAKE_SOURCE_DIR}/.git --work-tree ${CMAKE_SOURCE_DIR} log --pretty=format:%h -n 1
                 OUTPUT_VARIABLE BUILD_NUMBER
                 ERROR_QUIET)

diff --git a/help/help.html b/help/help.html
@@ -159,12 +159,12 @@
 }
 
 </style>
-<title>Resto 1.0.7</title>
+<title>Resto 1.1.0</title>
 </head>
 
 <body>
 <h1>Resto<img id="titleImage" alt="" src="./imgs/resto-logo.png" /></h1>
-<div class="subtitle">ver. 1.0.7</div>
+<div class="subtitle">ver. 1.1.0</div>
 
 <div class="tableContents">
 <ol>