From 5ebb2eba6014477a9a3e5f6315b2506fd8fe573d Mon Sep 17 00:00:00 2001 From: Lucas Baker Date: Tue, 6 Dec 2022 10:35:53 -0800 Subject: [PATCH] Bump to 1.1.0 (#12) * Disable version bump script for release versions * Bump to 1.1.0 * Fix iOS Co-authored-by: Luke Baker --- .azuredevops/main.yml | 4 ++-- .azuredevops/node-build.yml | 2 ++ .azuredevops/pr.yml | 4 ++-- android/app/build.gradle | 2 +- ios/IoT_PnP.xcodeproj/project.pbxproj | 6 +++--- package-lock.json | 4 ++-- package.json | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.azuredevops/main.yml b/.azuredevops/main.yml index 10b6d58..4118aaf 100644 --- a/.azuredevops/main.yml +++ b/.azuredevops/main.yml @@ -11,13 +11,13 @@ variables: - name: PAAD_BETARELEASE_VERSION_CODE value: 1 - name: PAAD_BETARELEASE_VERSION_NAME - value: 1.0.8 + value: 1.1.0 - name: PAAD_RELEASE_PROJECT_NAME value: $(Project_Name) - name: PAAD_RELEASE_VERSION_CODE value: 1 - name: PAAD_RELEASE_VERSION_NAME - value: 1.0.8 + value: 1.1.0 name: $(Date:yyyyMMdd)$(Rev:.r) stages: diff --git a/.azuredevops/node-build.yml b/.azuredevops/node-build.yml index 4676d54..f871c63 100644 --- a/.azuredevops/node-build.yml +++ b/.azuredevops/node-build.yml @@ -11,6 +11,8 @@ steps: - script: npm version prerelease --preid "$(Build.BuildNumber)" --no-git-tag-version workingDirectory: . displayName: "Increment version in package.json" + # For prod releases we should commit the version change to source. For test builds we can increment in the pipeline + condition: and(succeeded(), eq(variables.isMaster, false)) - task: ShellScript@2 inputs: diff --git a/.azuredevops/pr.yml b/.azuredevops/pr.yml index 0186c62..9d86c41 100644 --- a/.azuredevops/pr.yml +++ b/.azuredevops/pr.yml @@ -11,13 +11,13 @@ variables: - name: PAAD_BETARELEASE_VERSION_CODE value: 1 - name: PAAD_BETARELEASE_VERSION_NAME - value: 1.0.8 + value: 1.1.0 - name: PAAD_RELEASE_PROJECT_NAME value: $(Project_Name) - name: PAAD_RELEASE_VERSION_CODE value: 1 - name: PAAD_RELEASE_VERSION_NAME - value: 1.0.8 + value: 1.1.0 name: $(Date:yyyyMMdd)$(Rev:.r) stages: diff --git a/android/app/build.gradle b/android/app/build.gradle index 4973e23..9640475 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.0.8" + versionName "1.1.0" 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 c0468ba..129f9be 100644 --- a/ios/IoT_PnP.xcodeproj/project.pbxproj +++ b/ios/IoT_PnP.xcodeproj/project.pbxproj @@ -508,7 +508,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.8; + MARKETING_VERSION = 1.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -541,7 +541,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.8; + MARKETING_VERSION = 1.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -638,7 +638,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.8; + MARKETING_VERSION = 1.1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/package-lock.json b/package-lock.json index e16f321..a36aed3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "iotc-paad", - "version": "1.0.8", + "version": "1.1.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "iotc-paad", - "version": "1.0.6", + "version": "1.1.0", "hasInstallScript": true, "dependencies": { "@react-native-community/geolocation": "^2.0.2", diff --git a/package.json b/package.json index 640917e..ed9d9e8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "iotc-paad", - "version": "1.0.7", + "version": "1.1.0", "private": true, "scripts": { "android": "react-native run-android",