Skip to content

Commit

Permalink
Merge pull request #300 from Do-Good-Get-Good/release/1.3.0
Browse files Browse the repository at this point in the history
Release/1.3.0
  • Loading branch information
covetous authored Jun 25, 2024
2 parents 841a728 + 3efe55a commit faa9bc9
Show file tree
Hide file tree
Showing 9 changed files with 1,873 additions and 3,223 deletions.
4 changes: 2 additions & 2 deletions src/.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
NODE_ENV=dev
APP_VERSION=1.2.0
RELEASE_NUMBER=18
APP_VERSION=1.3.0
RELEASE_NUMBER=19
4 changes: 2 additions & 2 deletions src/.env.dev
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
NODE_ENV=dev
APP_VERSION=1.2.0
RELEASE_NUMBER=18
APP_VERSION=1.3.0
RELEASE_NUMBER=19
4 changes: 2 additions & 2 deletions src/.env.prod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
NODE_ENV=prod
APP_VERSION=1.2.0
RELEASE_NUMBER=18
APP_VERSION=1.3.0
RELEASE_NUMBER=19
14 changes: 11 additions & 3 deletions src/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ DerivedData
*.hmap
*.ipa
*.xcuserstate
ios/.xcode.env.local
**/.xcode.env.local

# Android/IntelliJ
#
Expand Down Expand Up @@ -56,7 +56,7 @@ yarn-error.log
*.jsbundle

# Ruby / CocoaPods
/ios/Pods/
**/Pods/
/vendor/bundle/

# Temporary files created by Metro to check the health of the file watcher
Expand All @@ -69,4 +69,12 @@ ios/tmp.xcconfig
/coverage

#plist ios
GoogleService-Info.plist
GoogleService-Info.plist

# Yarn
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
2 changes: 1 addition & 1 deletion src/Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'

# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby ">= 2.6.10"
ruby ">= 3.3.2"

gem 'cocoapods', '~> 1.13'
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
16 changes: 8 additions & 8 deletions src/ios/DoGoodGetGood.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -727,12 +727,12 @@
isa = XCBuildConfiguration;
baseConfigurationReference = F326B97D9F797D00EAC2F921 /* Pods-DoGoodGetGoodCommonPods-DoGoodGetGood.debug.xcconfig */;
buildSettings = {
APP_VERSION = 1.1.2;
APP_VERSION = 1.3.0;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 16;
CURRENT_PROJECT_VERSION = 19;
DEVELOPMENT_TEAM = 5GHCN7CPFY;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = DoGoodGetGood/Info.plist;
Expand All @@ -742,7 +742,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.3;
MARKETING_VERSION = 1.3.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -751,7 +751,7 @@
PRODUCT_BUNDLE_IDENTIFIER = se.technogarden.dogoodgetgood;
PRODUCT_NAME = DoGoodGetGood;
PROVISIONING_PROFILE_SPECIFIER = "";
RELEASE_NUMBER = 1.1.2;
RELEASE_NUMBER = 1.3.0;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
Expand All @@ -765,12 +765,12 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 855D82545C8956BF2B98A181 /* Pods-DoGoodGetGoodCommonPods-DoGoodGetGood.release.xcconfig */;
buildSettings = {
APP_VERSION = 1.1.2;
APP_VERSION = 1.3.0;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 16;
CURRENT_PROJECT_VERSION = 19;
DEVELOPMENT_TEAM = 5GHCN7CPFY;
INFOPLIST_FILE = DoGoodGetGood/Info.plist;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.business";
Expand All @@ -779,7 +779,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.3;
MARKETING_VERSION = 1.3.0;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -788,7 +788,7 @@
PRODUCT_BUNDLE_IDENTIFIER = se.technogarden.dogoodgetgood;
PRODUCT_NAME = DoGoodGetGood;
PROVISIONING_PROFILE_SPECIFIER = "";
RELEASE_NUMBER = 1.1.2;
RELEASE_NUMBER = 1.3.0;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SWIFT_VERSION = 5.0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Debug"
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Loading

0 comments on commit faa9bc9

Please sign in to comment.