diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e512912b655ca97c3dcb8d95945a7f6be3044118..6fe288e8fb21ab092bf8aa3c42a654e8b78853f4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,8 +61,13 @@ build android release: paths: - android/app/build/outputs/apk/release/app-release.apk deploy: - image: reactnativecommunity/react-native-android + image: registry.gitlab.com/alextiernan6/gitlab-ci-react-native-android stage: deploy + cache: + key: ${CI_PROJECT_ID} + paths: + - node_modules/ + - .gradle/ only: - /^v(\d*).(\d*).(\d*)$/i except: diff --git a/android/app/build.gradle b/android/app/build.gradle index 38e3ad22f937520f098c90914dc17045cdb2f6b1..1041c594f6346dca26ae400ac99186b0b7ac8a8e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -132,8 +132,8 @@ android { applicationId "com.pocketlab" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 4 - versionName "1.3.1" + versionCode 5 + versionName "1.3.2" manifestPlaceholders = [ appAuthRedirectScheme: 'pocketlab' ] diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 560b9f15ef163ecfb5ee6b4fc9a48e356519638a..88fb6176a4a01edb352f057c7ef7e06e043be8b0 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -12,11 +12,13 @@ platform :android do task: 'assemble', build_type: 'Release', project_dir: 'android/', - properties: { 'versionCode' => ENV['CI_JOB_ID']} ) end lane :release do - build - supply(track: 'production') + supply( + track: 'production', + package_name: 'com.pocketlab', + apk: 'android/app/build/outputs/apk/release/app-release.apk' + ) end end diff --git a/ios/PocketLab.xcodeproj/project.pbxproj b/ios/PocketLab.xcodeproj/project.pbxproj index 89d4b9c3b2c03716e638e7a934c1ae2e1e36fb38..0e0c3f92460ddac676f0496dbfc65552ed85a1b2 100644 --- a/ios/PocketLab.xcodeproj/project.pbxproj +++ b/ios/PocketLab.xcodeproj/project.pbxproj @@ -5,6 +5,7 @@ }; objectVersion = 46; objects = { + /* Begin PBXBuildFile section */ 00E356F31AD99517003FC87E /* PocketLabTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* PocketLabTests.m */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; @@ -451,7 +452,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "export SENTRY_PROPERTIES=sentry.properties\n../node_modules/@sentry/cli/bin/sentry-cli upload-dsym\n"; + shellScript = "export SENTRY_PROPERTIES=sentry.properties\n../node_modules/@sentry/cli/bin/sentry-cli upload-dsym"; }; 635763E925C8220AE06A6552 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; @@ -768,7 +769,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 4; + CURRENT_PROJECT_VERSION = 3; DEVELOPMENT_TEAM = B4XSM8FPK8; INFOPLIST_FILE = PocketLab/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 12.1; diff --git a/package.json b/package.json index 8db1d98951e9c331cdb0afa3dd920e36bfdda8b8..2bab44ebbc4f96739a43a993af5e4b282408039f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "PocketLab", - "version": "1.3.1", + "version": "1.3.2", "private": true, "scripts": { "android": "react-native run-android",