Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/v1.4.6 #664

Merged
merged 3 commits into from
Mar 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ node_modules

# Web
.sentryclirc
.next
.next
.idea
3 changes: 2 additions & 1 deletion packages/app/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ local.properties
.cxx/
*.keystore
!debug.keystore

my-release-key.jks
upload_certificate.pem
# node.js
npm-debug.log
yarn-error.log
Expand Down
3 changes: 2 additions & 1 deletion packages/app/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ source 'https://rubygems.org'
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby ">= 2.6.10"

gem 'cocoapods', '~> 1.12'
gem 'cocoapods', '~> 1.13'
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
4 changes: 2 additions & 2 deletions packages/app/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ android {
applicationId "com.goodcode.gloddy"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 5
versionName "1.3.0"
versionCode 7
versionName "1.4.0"
resValue 'string', "CODE_PUSH_APK_BUILD_TIME", String.format("\"%d\"", System.currentTimeMillis())
}
signingConfigs {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<resources>
<string name="app_name">GloddyProduction</string>
<string name="app_name">Gloddy</string>
<string moduleConfig="true" name="CodePushDeploymentKey">6HJ_bWr7ulUPvTR1cGjoayA8-zfSmqzATmNXs</string>
</resources>
4 changes: 2 additions & 2 deletions packages/app/android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ newArchEnabled=false
# If set to false, you will be using JSC instead.
hermesEnabled=true

MYAPP_RELEASE_STORE_FILE=my-upload-key.keystore
MYAPP_RELEASE_KEY_ALIAS=my-key-alias
MYAPP_RELEASE_STORE_FILE=my-release-key.jks
MYAPP_RELEASE_KEY_ALIAS=my-release-key
MYAPP_RELEASE_STORE_PASSWORD=gloddy
MYAPP_RELEASE_KEY_PASSWORD=gloddy

Expand Down
2 changes: 1 addition & 1 deletion packages/app/babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ module.exports = {
},
],
],
};
};
5 changes: 3 additions & 2 deletions packages/app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
* @format
*/

import {AppRegistry} from 'react-native';
import { AppRegistry } from 'react-native';

import App from './App';
import {name as appName} from './app.json';
import { name as appName } from './app.json';

AppRegistry.registerComponent(appName, () => App);
4 changes: 0 additions & 4 deletions packages/app/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ setup_permissions([
# 'StoreKit',
])

flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled

linkage = ENV['USE_FRAMEWORKS']
if linkage != nil
Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
Expand All @@ -61,8 +59,6 @@ target 'gloddy' do
#
# Note that if you have use_frameworks! enabled, Flipper will not work and
# you should disable the next line.
# :flipper_configuration => flipper_config = FlipperConfiguration.enabled(["Release","Debug"]),
:flipper_configuration => flipper_config,
# An absolute path to your application root.
:app_path => "#{Pod::Config.instance.installation_root}/.."
)
Expand Down
Loading
Loading