This commit is contained in:
lucadruda 2023-05-04 10:25:12 +02:00
Родитель 9835312998
Коммит 8752b67d22
5 изменённых файлов: 28 добавлений и 14 удалений

Просмотреть файл

@ -19,13 +19,13 @@ variables:
- name: PAAD_BETARELEASE_VERSION_CODE - name: PAAD_BETARELEASE_VERSION_CODE
value: 1 value: 1
- name: PAAD_BETARELEASE_VERSION_NAME - name: PAAD_BETARELEASE_VERSION_NAME
value: 1.1.0 value: 1.1.1
- name: PAAD_RELEASE_PROJECT_NAME - name: PAAD_RELEASE_PROJECT_NAME
value: $(Project_Name) value: $(Project_Name)
- name: PAAD_RELEASE_VERSION_CODE - name: PAAD_RELEASE_VERSION_CODE
value: 1 value: 1
- name: PAAD_RELEASE_VERSION_NAME - name: PAAD_RELEASE_VERSION_NAME
value: 1.1.0 value: 1.1.1
name: $(Date:yyyyMMdd)$(Rev:.r) name: $(Date:yyyyMMdd)$(Rev:.r)
stages: stages:
@ -194,13 +194,18 @@ stages:
unsignedIpa: '$(exportPath)/$(Project_Name).ipa' unsignedIpa: '$(exportPath)/$(Project_Name).ipa'
signedExtractedPath: '$(exportPath)/signed' signedExtractedPath: '$(exportPath)/signed'
steps: steps:
# Uncomment task below when macos-13 host machines become stable
# - task: UseRubyVersion@0 # - task: UseRubyVersion@0
# inputs: # inputs:
# versionSpec: '< 2.8' # 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: gpg --keyserver keyserver.ubuntu.com --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
- bash: curl -sSL https://get.rvm.io | bash -s stable - 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 install 2.7.4
- bash: source /Users/runner/.rvm/scripts/rvm && rvm use 2.7.4 - bash: source /Users/runner/.rvm/scripts/rvm && rvm use 2.7.4
# --- END ----- #
- bash: gem install bundler cocoapods - bash: gem install bundler cocoapods
@ -351,9 +356,18 @@ stages:
unsignedIpa: '$(exportPath)/$(Project_Name).ipa' unsignedIpa: '$(exportPath)/$(Project_Name).ipa'
signedExtractedPath: '$(exportPath)/signed' signedExtractedPath: '$(exportPath)/signed'
steps: steps:
- task: UseRubyVersion@0 # Uncomment task below when macos-13 host machines become stable
inputs: # - task: UseRubyVersion@0
versionSpec: '< 2.8' # 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 - bash: gem install bundler cocoapods

Просмотреть файл

@ -12,13 +12,13 @@ variables:
- name: PAAD_BETARELEASE_VERSION_CODE - name: PAAD_BETARELEASE_VERSION_CODE
value: 1 value: 1
- name: PAAD_BETARELEASE_VERSION_NAME - name: PAAD_BETARELEASE_VERSION_NAME
value: 1.1.0 value: 1.1.1
- name: PAAD_RELEASE_PROJECT_NAME - name: PAAD_RELEASE_PROJECT_NAME
value: $(Project_Name) value: $(Project_Name)
- name: PAAD_RELEASE_VERSION_CODE - name: PAAD_RELEASE_VERSION_CODE
value: 1 value: 1
- name: PAAD_RELEASE_VERSION_NAME - name: PAAD_RELEASE_VERSION_NAME
value: 1.1.0 value: 1.1.1
name: $(Date:yyyyMMdd)$(Rev:.r) name: $(Date:yyyyMMdd)$(Rev:.r)
stages: stages:

Просмотреть файл

@ -138,7 +138,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 2 versionCode 2
versionName "1.1.0" versionName "1.1.1"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
missingDimensionStrategy 'react-native-camera', 'general' missingDimensionStrategy 'react-native-camera', 'general'

Просмотреть файл

@ -513,7 +513,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.1.0; MARKETING_VERSION = 1.1.1;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
@ -546,7 +546,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.1.0; MARKETING_VERSION = 1.1.1;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
@ -643,7 +643,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.1.0; MARKETING_VERSION = 1.1.1;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",
@ -767,7 +767,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.1.0; MARKETING_VERSION = 1.1.1;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
"-ObjC", "-ObjC",

Просмотреть файл

@ -1,6 +1,6 @@
{ {
"name": "iotc-paad", "name": "iotc-paad",
"version": "1.1.0", "version": "1.1.1",
"private": true, "private": true,
"scripts": { "scripts": {
"android": "react-native run-android", "android": "react-native run-android",