From 8752b67d22a3b6c5a2c9fb7a3c3f33093b3a6ac0 Mon Sep 17 00:00:00 2001
From: lucadruda <lucadruda@gmail.com>
Date: Thu, 4 May 2023 10:25:12 +0200
Subject: [PATCH] update version

---
 .azuredevops/main.yml                 | 26 ++++++++++++++++++++------
 .azuredevops/pr.yml                   |  4 ++--
 android/app/build.gradle              |  2 +-
 ios/IoT_PnP.xcodeproj/project.pbxproj |  8 ++++----
 package.json                          |  2 +-
 5 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/.azuredevops/main.yml b/.azuredevops/main.yml
index b88c31a..dd126ad 100644
--- a/.azuredevops/main.yml
+++ b/.azuredevops/main.yml
@@ -19,13 +19,13 @@ variables:
   - name: PAAD_BETARELEASE_VERSION_CODE
     value: 1
   - name: PAAD_BETARELEASE_VERSION_NAME
-    value: 1.1.0
+    value: 1.1.1
   - name: PAAD_RELEASE_PROJECT_NAME
     value: $(Project_Name)
   - name: PAAD_RELEASE_VERSION_CODE
     value: 1
   - name: PAAD_RELEASE_VERSION_NAME
-    value: 1.1.0
+    value: 1.1.1
 
 name: $(Date:yyyyMMdd)$(Rev:.r)
 stages:
@@ -194,14 +194,19 @@ stages:
           unsignedIpa: '$(exportPath)/$(Project_Name).ipa'
           signedExtractedPath: '$(exportPath)/signed'
         steps:
+          # Uncomment task below when macos-13 host machines become stable
           # - task: UseRubyVersion@0
           #   inputs:
           #     versionSpec: '< 2.8'
+
+          # --- RUBY WORKAROUND ----- #
+          # macos-13 host machines currently do not support ruby versions other than default (3.0.x). Our project requires 2.7.4.
           - bash: gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
           - bash: curl -sSL https://get.rvm.io | bash -s stable
           - bash: source /Users/runner/.rvm/scripts/rvm && rvm install 2.7.4
           - bash: source /Users/runner/.rvm/scripts/rvm && rvm use 2.7.4
-          
+          # --- END ----- #
+
           - bash: gem install bundler cocoapods
 
           - template: ./node-build.yml
@@ -351,9 +356,18 @@ stages:
           unsignedIpa: '$(exportPath)/$(Project_Name).ipa'
           signedExtractedPath: '$(exportPath)/signed'
         steps:
-          - task: UseRubyVersion@0
-            inputs:
-              versionSpec: '< 2.8'
+          # Uncomment task below when macos-13 host machines become stable
+          # - task: UseRubyVersion@0
+          #   inputs:
+          #     versionSpec: '< 2.8'
+
+          # --- RUBY WORKAROUND ----- #
+          # macos-13 host machines currently do not support ruby versions other than default (3.0.x). Our project requires 2.7.4.
+          - bash: gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+          - bash: curl -sSL https://get.rvm.io | bash -s stable
+          - bash: source /Users/runner/.rvm/scripts/rvm && rvm install 2.7.4
+          - bash: source /Users/runner/.rvm/scripts/rvm && rvm use 2.7.4
+          # --- END ----- #
           
           - bash: gem install bundler cocoapods
 
diff --git a/.azuredevops/pr.yml b/.azuredevops/pr.yml
index fff250d..65d6ba6 100644
--- a/.azuredevops/pr.yml
+++ b/.azuredevops/pr.yml
@@ -12,13 +12,13 @@ variables:
   - name: PAAD_BETARELEASE_VERSION_CODE
     value: 1
   - name: PAAD_BETARELEASE_VERSION_NAME
-    value: 1.1.0
+    value: 1.1.1
   - name: PAAD_RELEASE_PROJECT_NAME
     value: $(Project_Name)
   - name: PAAD_RELEASE_VERSION_CODE
     value: 1
   - name: PAAD_RELEASE_VERSION_NAME
-    value: 1.1.0
+    value: 1.1.1
 
 name: $(Date:yyyyMMdd)$(Rev:.r)
 stages:
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 9640475..aabc939 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -138,7 +138,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 2
-        versionName "1.1.0"
+        versionName "1.1.1"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
         missingDimensionStrategy 'react-native-camera', 'general'
 
diff --git a/ios/IoT_PnP.xcodeproj/project.pbxproj b/ios/IoT_PnP.xcodeproj/project.pbxproj
index 3197e35..aef84ca 100644
--- a/ios/IoT_PnP.xcodeproj/project.pbxproj
+++ b/ios/IoT_PnP.xcodeproj/project.pbxproj
@@ -513,7 +513,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.1.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -546,7 +546,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.1.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -643,7 +643,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.1.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -767,7 +767,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 1.1.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
diff --git a/package.json b/package.json
index e716a6d..f98fbad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iotc-paad",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": true,
   "scripts": {
     "android": "react-native run-android",