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

fix: prettier #4

Open
wants to merge 28 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
12259e0
fix: prettier
valeriaFireblocks Jun 4, 2024
6fcafa4
fix: lint error
valeriaFireblocks Jun 4, 2024
8e546d0
fix: lint error
valeriaFireblocks Jun 4, 2024
a828c85
fix: test failed
valeriaFireblocks Jun 4, 2024
7866071
fix: revert android version
valeriaFireblocks Jun 4, 2024
7dfdae5
fix: install pod dependencies
valeriaFireblocks Jun 4, 2024
2cf0d95
fix: ios build
valeriaFireblocks Jun 4, 2024
6b3ec69
fix: ios build
valeriaFireblocks Jun 5, 2024
2e6fc90
fix: remove package resolved
valeriaFireblocks Jun 5, 2024
d6f282b
fix: remove cache in CI
valeriaFireblocks Jun 5, 2024
f495049
fix: ios build
valeriaFireblocks Jun 5, 2024
8d6cc3a
fix: remove ios test
valeriaFireblocks Jun 5, 2024
ff32e49
fix: podfile
valeriaFireblocks Jun 5, 2024
17d6f37
fix: ios
valeriaFireblocks Jun 5, 2024
d5d1ca4
fix: ios build
valeriaFireblocks Jun 5, 2024
3040a53
feat: add eddsa
valeriaFireblocks Jun 6, 2024
6273f87
fix: dependencies
valeriaFireblocks Jun 10, 2024
e6c2db2
fix: yarn.lock
valeriaFireblocks Jun 10, 2024
ac1cd0f
fix: backend url
valeriaFireblocks Jun 10, 2024
7aa9b10
feat: android add dev9 env config
valeriaFireblocks Jun 16, 2024
2a9c47d
feat: add EDDSA algo
valeriaFireblocks Jun 16, 2024
c03dfef
feat: ios add dev9 env config
valeriaFireblocks Jun 18, 2024
bce2ba1
fix: wip
valeriaFireblocks Jun 20, 2024
2228724
fix: wip
valeriaFireblocks Jun 20, 2024
942a1bf
fix: lint errors
valeriaFireblocks Jun 20, 2024
e359751
fix: wip
valeriaFireblocks Jun 20, 2024
62df3c0
Merge branch 'main' into prettier
valeriaFireblocks Jul 14, 2024
0c046a9
fix: wip
valeriaFireblocks Jul 14, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:

- name: Build example for Android
env:
JAVA_OPTS: "-XX:MaxHeapSize=6g"
JAVA_OPTS: '-XX:MaxHeapSize=6g'
run: |
yarn turbo run build:android --cache-dir="${{ env.TURBO_CACHE_DIR }}"

Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
${{ runner.os }}-cocoapods-

- name: Install cocoapods
if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true'
# if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true'
run: |
cd example/ios
pod install
Expand Down
16 changes: 15 additions & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ repositories {
mavenCentral()
google()

// Sandbox:
maven {
url = "https://maven.fireblocks.io/android-sdk/maven"
name = "android-sdk"
Expand All @@ -109,6 +110,17 @@ repositories {
}
authentication { header(HttpHeaderAuthentication) }
}

// //dev9:
// maven {
// url = "https://gitlab.com/api/v4/projects/42877710/packages/maven"
// name = "android-sdk"
// credentials(HttpHeaderCredentials) {
// name = "Deploy-Token"
// value = "vq2yuSp4Vxu5tzyExoXt"
// }
// authentication { header(HttpHeaderAuthentication) }
// }
}

def kotlin_version = getExtOrDefault("kotlinVersion")
Expand All @@ -119,7 +131,9 @@ dependencies {
//noinspection GradleDynamicVersion
implementation "com.facebook.react:react-native:+"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation "com.fireblocks.sdk:ncw:2.5.0"
// implementation "com.fireblocks.sdk:ncw-dev:2.5.0" //dev9
implementation "com.fireblocks.sdk:ncw:2.5.0" //sandbox

}

if (isNewArchitectureEnabled()) {
Expand Down
4 changes: 3 additions & 1 deletion example/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ GEM
base64
nkf
rexml
activesupport (7.0.8.1)
activesupport (6.1.7.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
algoliasearch (1.27.5)
Expand Down Expand Up @@ -88,6 +89,7 @@ GEM
colored2 (~> 3.1)
nanaimo (~> 0.3.0)
rexml (~> 3.2.4)
zeitwerk (2.6.15)

PLATFORMS
ruby
Expand Down
2 changes: 1 addition & 1 deletion example/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ This is a new [**React Native**](https://reactnative.dev) project, bootstrapped

# Getting Started

>**Note**: Make sure you have completed the [React Native - Environment Setup](https://reactnative.dev/docs/environment-setup) instructions till "Creating a new application" step, before proceeding.
> **Note**: Make sure you have completed the [React Native - Environment Setup](https://reactnative.dev/docs/environment-setup) instructions till "Creating a new application" step, before proceeding.

## Step 1: Start the Metro Server

Expand Down
32 changes: 23 additions & 9 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -106,22 +106,36 @@ android {
}

repositories {
maven {
url = "https://maven.fireblocks.io/android-sdk/maven"
name = "android-sdk"
credentials(HttpHeaderCredentials) {
name = "Deploy-Token"
value = "-fU8ijmuPohHaqDBgpaT"
}
authentication { header(HttpHeaderAuthentication) }
// Sandbox:
maven {
url = "https://maven.fireblocks.io/android-sdk/maven"
name = "android-sdk"
credentials(HttpHeaderCredentials) {
name = "Deploy-Token"
value = "-fU8ijmuPohHaqDBgpaT"
}
authentication { header(HttpHeaderAuthentication) }
}

// //dev9:
// maven {
// url = "https://gitlab.com/api/v4/projects/42877710/packages/maven"
// name = "android-sdk"
// credentials(HttpHeaderCredentials) {
// name = "Deploy-Token"
// value = "vq2yuSp4Vxu5tzyExoXt"
// }
// authentication { header(HttpHeaderAuthentication) }
// }
}

dependencies {
// The version of react-native is set by the React Native Gradle Plugin
implementation("com.facebook.react:react-android")
implementation("com.facebook.react:flipper-integration")
implementation("com.fireblocks.sdk:ncw:2.5.0")
implementation("com.fireblocks.sdk:ncw:2.5.0") //sandbox
// implementation("com.fireblocks.sdk:ncw-dev:2.5.0") //dev9


if (hermesEnabled.toBoolean()) {
implementation("com.facebook.react:hermes-android")
Expand Down
2 changes: 2 additions & 0 deletions example/ios/.xcode.env.local
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export NODE_BINARY=/opt/homebrew/bin/node

4 changes: 2 additions & 2 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ PODS:
- GoogleUtilities/Environment (~> 7.8)
- GoogleUtilities/UserDefaults (~> 7.8)
- PromisesObjC (~> 2.1)
- fireblocks-react-native-ncw-sdk (1.0.0):
- fireblocks-react-native-ncw-sdk (1.0.1):
- glog
- RCT-Folly (= 2022.05.16.00)
- React-Core
Expand Down Expand Up @@ -1545,7 +1545,7 @@ SPEC CHECKSUMS:
FirebaseCore: 28045c1560a2600d284b9c45a904fe322dc890b6
FirebaseCoreInternal: bca337352024b18424a61e478460547d46c4c753
FirebaseInstallations: 763814908793c0da14c18b3dcffdec71e29ed55e
fireblocks-react-native-ncw-sdk: 867882b558c0a3ef1c7a79d2e21af7db40a5a88e
fireblocks-react-native-ncw-sdk: 2d2ea406e10daf0bb129212af21ae94e858a039c
Flipper: c7a0093234c4bdd456e363f2f19b2e4b27652d44
Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
Expand Down
Loading
Loading