Merge pull request #113 from BranchMetrics/version-bump

jdee · web-flow · commit c83ee982b373 · 2021-06-03T15:08:30.000-07:00
Version bump to 1.2.3
diff --git a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic-Package/Product.wxs b/BranchSDK-Samples/TestBed-Basic/TestBed-Basic-Package/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="Branch TestBed (Basic)" Language="1033" Version="1.2.2" Manufacturer="Branch Metrics, Inc." UpgradeCode="f66f62db-fbea-4c26-b0e3-ab91241a71da">
+  <Product Id="*" Name="Branch TestBed (Basic)" Language="1033" Version="1.2.3" Manufacturer="Branch Metrics, Inc." UpgradeCode="f66f62db-fbea-4c26-b0e3-ab91241a71da">
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
 
     <MajorUpgrade DowngradeErrorMessage="A newer version of TestBed (Basic) is already installed." />
diff --git a/BranchSDK-Samples/TestBed-Basic/TestBed-Basic.rc b/BranchSDK-Samples/TestBed-Basic/TestBed-Basic.rc
diff --git a/BranchSDK-Samples/TestBed-Basic/Welcome.html b/BranchSDK-Samples/TestBed-Basic/Welcome.html
@@ -40,7 +40,7 @@
     </head>
     <body>
         <h1>Welcome to the Branch Metrics C++/Win32 SDK</h1>
-        <h2>Release 1.2.2</h2>
+        <h2>Release 1.2.3</h2>
         <table>
             <tr>
                 <td>
diff --git a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Package.appxmanifest b/BranchSDK-Samples/TestBed-Conan/TestBed-Conan-Package/Package.appxmanifest
@@ -9,7 +9,7 @@
   <Identity
     Name="7dad590b-3b99-43f8-a027-fe84615ff35c"
     Publisher="CN=Branch Metrics, C=US"
-    Version="1.2.2.0" />
+    Version="1.2.3.0" />
 
   <Properties>
     <DisplayName>Branch TestBed (Conan)</DisplayName>
diff --git a/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.rc b/BranchSDK-Samples/TestBed-Conan/TestBed-Conan.rc
diff --git a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro-Package/Product.wxs b/BranchSDK-Samples/TestBed-Distro/TestBed-Distro-Package/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="Branch TestBed" Language="1033" Version="1.2.2" Manufacturer="Branch Metrics, Inc." UpgradeCode="b85f316f-c342-4445-b8b5-c5186eba60c3">
+  <Product Id="*" Name="Branch TestBed" Language="1033" Version="1.2.3" Manufacturer="Branch Metrics, Inc." UpgradeCode="b85f316f-c342-4445-b8b5-c5186eba60c3">
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
 
     <MajorUpgrade DowngradeErrorMessage="A newer version of TestBed is already installed." />
diff --git a/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.rc b/BranchSDK-Samples/TestBed-Distro/TestBed-Distro.rc
diff --git a/BranchSDK-Samples/TestBed-Distro/Welcome.html b/BranchSDK-Samples/TestBed-Distro/Welcome.html
@@ -40,7 +40,7 @@
     </head>
     <body>
         <h1>Welcome to the Branch Metrics C++/Win32 SDK</h1>
-        <h2>Release 1.2.2</h2>
+        <h2>Release 1.2.3</h2>
         <table>
             <tr>
                 <td>
diff --git a/BranchSDK-Samples/TestBed-Local/TestBed-Local.rc b/BranchSDK-Samples/TestBed-Local/TestBed-Local.rc
diff --git a/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Package.appxmanifest b/BranchSDK-Samples/TestBed-Local/TestBedLocalPackage/Package.appxmanifest
@@ -9,7 +9,7 @@
   <Identity
     Name="144cb4b1-60b9-40ab-ad84-b335d5d28d05"
     Publisher="CN=Branch Metrics, C=US"
-    Version="1.2.2.0" />
+    Version="1.2.3.0" />
 
   <Properties>
     <DisplayName>Branch TestBed (Local)</DisplayName>
diff --git a/BranchSDK-Samples/TestBed/BranchOperations.cpp b/BranchSDK-Samples/TestBed/BranchOperations.cpp
@@ -110,7 +110,7 @@ BranchOperations::initBranch(const std::wstring& branchKey, const std::wstring&
 
     // Now initialize the SDK
     AppInfo appInfo;
-    appInfo.setAppVersion("1.2.2");
+    appInfo.setAppVersion("1.2.3");
 
     branch = Branch::create(branchKey, &appInfo);
 
diff --git a/BranchSDK-Samples/TestBed/TestBed.rc b/BranchSDK-Samples/TestBed/TestBed.rc
diff --git a/BranchSDK-Samples/TestBed/TestBedPackage/Package.appxmanifest b/BranchSDK-Samples/TestBed/TestBedPackage/Package.appxmanifest
@@ -9,7 +9,7 @@
   <Identity
     Name="be454d8c-d9d9-4afc-afe2-32941f166d5b"
     Publisher="CN=Branch Metrics, C=US"
-    Version="1.2.2.0" />
+    Version="1.2.3.0" />
 
   <Properties>
     <DisplayName>Branch TestBed</DisplayName>
diff --git a/BranchSDK/Windows/BranchInstaller/Product.wxs b/BranchSDK/Windows/BranchInstaller/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" ?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Language="1033" Manufacturer="Branch Metrics, Inc." Name="Branch C++ SDK for Windows" UpgradeCode="29b1dc08-2190-48f0-bc3c-7455381f2156" Version="1.2.2">
+  <Product Id="*" Language="1033" Manufacturer="Branch Metrics, Inc." Name="Branch C++ SDK for Windows" UpgradeCode="29b1dc08-2190-48f0-bc3c-7455381f2156" Version="1.2.3">
     <Package Compressed="yes" InstallScope="perMachine" InstallerVersion="200"/>
     <MajorUpgrade DowngradeErrorMessage="A newer version of Branch C++ SDK for Windows is already installed."/>
     <Media Cabinet="cab1.cab" EmbedCab="yes" Id="1"/>
diff --git a/BranchSDK/src/BranchIO/Version.h b/BranchSDK/src/BranchIO/Version.h
@@ -5,6 +5,6 @@
 
 #define BRANCHIO_VERSION_MAJOR               1
 #define BRANCHIO_VERSION_MINOR               2
-#define BRANCHIO_VERSION_REVISION            2
+#define BRANCHIO_VERSION_REVISION            3
 
 #endif  // BRANCHIO_VERSION_H__
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.12)
 
-project(root VERSION 1.2.2 LANGUAGES CXX)
+project(root VERSION 1.2.3 LANGUAGES CXX)
 
 # Determines handling of RPATH and related variables when building dylibs on Mac.
 # TODO(jdee): Review this. RPATH is an issue on Unix right now.
diff --git a/conanfile.py b/conanfile.py
@@ -11,7 +11,7 @@ class BranchioConan(ConanFile):
 
     # ----- Package metadata -----
     name = "BranchIO"
-    version = "1.2.2"
+    version = "1.2.3"
     license = "MIT"
     description = "Branch Metrics deep linking and attribution analytics C++ SDK"
     topics = (
