fix: android, ios build error (#659)

gloddy-dev · Mar 14, 2024 · 01b3166 · 01b3166
1 parent 1d7098e
commit 01b3166
Show file tree

Hide file tree

Showing 13 changed files with 222 additions and 443 deletions.
diff --git a/packages/app/.gitignore b/packages/app/.gitignore
@@ -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

diff --git a/packages/app/Gemfile b/packages/app/Gemfile
@@ -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'
diff --git a/packages/app/android/app/build.gradle b/packages/app/android/app/build.gradle
@@ -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 {

diff --git a/packages/app/android/app/src/production/res/values/strings.xml b/packages/app/android/app/src/production/res/values/strings.xml
@@ -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>
diff --git a/packages/app/android/gradle.properties b/packages/app/android/gradle.properties
@@ -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
 

diff --git a/packages/app/babel.config.js b/packages/app/babel.config.js
@@ -12,4 +12,4 @@ module.exports = {
  },
  ],
  ],
-};
+};
diff --git a/packages/app/index.js b/packages/app/index.js
@@ -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);
diff --git a/packages/app/ios/Podfile b/packages/app/ios/Podfile
@@ -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
@@ -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}/.."
  )