Skip to content

Commit

Permalink
React native upgrade (#251)
Browse files Browse the repository at this point in the history
* Added new ios setup

* Build sucessfull with new setup

* react native metro fixes in new setup

* react native vector icons fixed for android

* Network error fixed

* fix yarnrc and gitignore

* Fixed react native action button

* local build

* add own Floating action button and removed react-native-action-button
dependency

* fix network error

* remove all yarn cache

* increase node version

* use jdk 17 as the workflow is failing due to java version error

* explicitly set yarn version to 4.x

* update setup yarn action

* disable cache

* minor fixes

* Fixed create color manully icon

* fix icons in grid action buttons

* restore ios gitignore

---------

Co-authored-by: Kamal Joshi <[email protected]>
  • Loading branch information
bhujoshi and kamalkishor1991 authored Sep 14, 2024
1 parent 0a80237 commit 125beb4
Show file tree
Hide file tree
Showing 35,743 changed files with 13,856 additions and 6,759,732 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 3 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,7 @@
"sourceType": "module"
},
"plugins": ["react", "react-native"],
"rules": {}
"rules": {
"react/prop-types": 0
}
}
13 changes: 11 additions & 2 deletions .github/workflows/release-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,17 @@ jobs:

- uses: actions/setup-node@v1
with:
node-version: '16.x'

node-version: '18.x'
- name: Setup Latest Yarn
uses: threeal/[email protected]
with:
version: 4.4.1
cache: false
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
- uses: ruby/setup-ruby@v1
with:
ruby-version: '3.0.0'
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,7 @@ ios/fastlane1/screenshots
*.jsbundle
localnotes.txt
.env
.yarn/cache
ios/*.cer
ios/croma.app.*.zip
.yarn/install-state.gz
19 changes: 19 additions & 0 deletions .yarn/patches/react-native-color-thief-https-ef3c7adcb0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
diff --git a/android/build.gradle b/android/build.gradle
index 58310fe4ad247432eb707aeaed04002826655e8e..6473c076b447afeb0a3540949743703d892349f5 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -15,11 +15,11 @@ buildscript {
apply plugin: 'com.android.library'

android {
- compileSdkVersion 29
+ compileSdkVersion 34

defaultConfig {
- minSdkVersion 16
- targetSdkVersion 29
+ minSdkVersion 23
+ targetSdkVersion 34
versionCode 1
versionName "1.0"
}
21 changes: 21 additions & 0 deletions .yarn/patches/react-native-share-menu-npm-6.0.0-f1094c3204.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
diff --git a/android/build.gradle b/android/build.gradle
index 9557fdbf2fbf97b7f7aeaf7ce86d301a8ced213d..941b5241e4d56f892338c6f26d9dd70d98e26b80 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'

android {
- compileSdkVersion 29
- buildToolsVersion "29.0.2"
+ compileSdkVersion 34
+ buildToolsVersion "34.0.0"

defaultConfig {
- minSdkVersion 16
- targetSdkVersion 29
+ minSdkVersion 23
+ targetSdkVersion 34
versionCode 1
versionName "1.0"
ndk {
5 changes: 5 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
compressionLevel: mixed

enableGlobalCache: false

nodeLinker: node-modules
55 changes: 0 additions & 55 deletions android/app/_BUCK

This file was deleted.

Loading

0 comments on commit 125beb4

Please sign in to comment.