Skip to content
Closed
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
23 changes: 3 additions & 20 deletions .github/workflows/quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,6 @@ jobs:
working-directory: app
run: yarn install --immutable

- name: Cache bcsc-core build output
uses: actions/cache@v3
with:
path: packages/bcsc-core/lib
# Cache will be invalidated if any source file changes
key: ${{ runner.os }}-bcsc-core-build-${{ hashFiles('packages/bcsc-core/src/**') }}
restore-keys: |
${{ runner.os }}-bcsc-core-build-

# Note: The `bcsc-core` package must be built before type checking.
- name: Build bcsc-core
working-directory: packages/bcsc-core
run: yarn build

- name: Check style
working-directory: app
run: |
Expand All @@ -58,12 +44,9 @@ jobs:
working-directory: app
run: yarn lint

# TEMPORARILY DISABLED: TypeScript check
# TODO: Re-enable after fixing theme.ts type errors in separate PR
# - name: Check types
# working-directory: app
# # Note: To pass the type check, the `bcsc-core` package must be built first.
# run: yarn typecheck
- name: Check types
working-directory: app
run: yarn typecheck

test:
runs-on: ubuntu-22.04
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
index 5cc55c5ee3d05cbe9a7b92b0d1b031e0166c7456..3639134c3858f2cad688b6eebf778db8105006d4 100644
--- a/android/CMakeLists.txt
+++ b/android/CMakeLists.txt
@@ -87,7 +87,15 @@ if(${REACT_NATIVE_VERSION} LESS 71)
)
endif()

-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
+if(${REACT_NATIVE_VERSION} GREATER_EQUAL 76)
+ # RN 0.76 merged libreactnativejni into a single libreactnative.so prefab target
+ target_link_libraries(
+ ${PACKAGE_NAME}
+ ReactAndroid::jsi
+ ReactAndroid::reactnative
+ fbjni::fbjni
+ )
+elseif(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
target_link_libraries(
${PACKAGE_NAME}
ReactAndroid::jsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
index 74b6aff9c7cf062724475a58b9030f655a939e18..54b65bc306c926a866c10e74c88a6fff8d1c3eca 100644
--- a/android/CMakeLists.txt
+++ b/android/CMakeLists.txt
@@ -87,7 +87,15 @@ if(${REACT_NATIVE_VERSION} LESS 71)
)
endif()

-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
+if(${REACT_NATIVE_VERSION} GREATER_EQUAL 76)
+ # RN 0.76 merged libreactnativejni into a single libreactnative.so prefab target
+ target_link_libraries(
+ ${PACKAGE_NAME}
+ ReactAndroid::jsi
+ ReactAndroid::reactnative
+ fbjni::fbjni
+ )
+elseif(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
target_link_libraries(
${PACKAGE_NAME}
ReactAndroid::jsi
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
diff --git a/android/CMakeLists.txt b/android/CMakeLists.txt
index c84556e989cd95a18c5a8296931c8d97671a3c5c..47ef06ff796d4ce0ca0ffd1338dc5dc7965834a9 100644
--- a/android/CMakeLists.txt
+++ b/android/CMakeLists.txt
@@ -87,7 +87,15 @@ if(${REACT_NATIVE_VERSION} LESS 71)
)
endif()

-if(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
+if(${REACT_NATIVE_VERSION} GREATER_EQUAL 76)
+ # RN 0.76 merged libreactnativejni into a single libreactnative.so prefab target
+ target_link_libraries(
+ ${PACKAGE_NAME}
+ ReactAndroid::jsi
+ ReactAndroid::reactnative
+ fbjni::fbjni
+ )
+elseif(${REACT_NATIVE_VERSION} GREATER_EQUAL 71)
target_link_libraries(
${PACKAGE_NAME}
ReactAndroid::jsi
diff --git a/android/build.gradle b/android/build.gradle
index 9017d77eb32573415c7922cd83dae5cd792a885f..083320b13d82925625e57b929387a20a6d42c841 100644
--- a/android/build.gradle
Expand Down
307 changes: 307 additions & 0 deletions UPGRADE_PROGRESS.md

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion app/.bundle/config
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
BUNDLE_FORCE_RUBY_PLATFORM: "1"
BUNDLE_FROZEN: "true"
BUNDLE_FROZEN: "false"
BUNDLE_DEPLOYMENT: "false"
2 changes: 2 additions & 0 deletions app/.env.sample
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# OCA_URL sourced from upstream bcgov/aries-oca-bundles repository
OCA_URL=https://raw.githubusercontent.com/bcgov/aries-oca-bundles/main/
MEDIATOR_URL=https://f326-207-194-65-204.ngrok.io?c_i=eyJAdHlwZSI6ICJodHRwczovL2RpZGNvbW0ub3JnL2Nvbm5lY3Rpb25zLzEuMC9pbnZpdGF0aW9uIiwgIkBpZCI6ICI2MjQ0ZThiNS0wNWYzLTRhYWItYjM1Yy1lYWVlMWNmZTAyM2MiLCAicmVjaXBpZW50S2V5cyI6IFsiQ3lqM1BHRUJzQ3RyUGFtTTQyRngza3BlYmR2QWdNd1lGejlFS3RmNnlUN3giXSwgImxhYmVsIjogIk1lZGlhdG9yIiwgInNlcnZpY2VFbmRwb2ludCI6ICJodHRwczovL2YzMjYtMjA3LTE5NC02NS0yMDQubmdyb2suaW8ifQ==
# Enable Pickup V2 live mode + batch pickup (required for Credo-TS mediators)
MEDIATOR_USE_V2_BATCH_PICKUP=false
MEDIATOR_USE_PUSH_NOTIFICATIONS=false
LOAD_STORYBOOK=false
PROOF_TEMPLATE_URL=
Expand Down
47 changes: 22 additions & 25 deletions app/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import Toast from 'react-native-toast-message'
import { container } from 'tsyringe'

import Root from '@/Root'
import { BCSCApiClientProvider } from '@/bcsc-theme/contexts/BCSCApiClientContext'
import { KeyRingThemeNames, surveyMonkeyExitUrl, surveyMonkeyUrl } from '@/constants'
import { localization } from '@/localization'
import { initialState, reducer } from '@/store'
Expand Down Expand Up @@ -70,30 +69,28 @@ const App = () => {
<ErrorBoundaryWrapper logger={BCLogger}>
<ContainerProvider value={bcwContainer}>
<StoreProvider initialState={initialState} reducer={reducer}>
<BCSCApiClientProvider>
<ThemeProvider themes={themes} defaultThemeName={KeyRingThemeNames.KeyRing}>
<NavContainer navigationRef={navigationRef}>
<AnimatedComponentsProvider value={animatedComponents}>
<AuthProvider>
<NetworkProvider>
<ErrorModal enableReport />
<WitnessErrorDialogContainer />
<WebDisplay
destinationUrl={surveyMonkeyUrl}
exitUrl={surveyMonkeyExitUrl}
visible={surveyVisible}
onClose={() => setSurveyVisible(false)}
/>
<TourProvider tours={tours} overlayColor={'black'} overlayOpacity={0.7}>
<Root />
</TourProvider>
<Toast topOffset={15} config={toastConfig} />
</NetworkProvider>
</AuthProvider>
</AnimatedComponentsProvider>
</NavContainer>
</ThemeProvider>
</BCSCApiClientProvider>
<ThemeProvider themes={themes} defaultThemeName={KeyRingThemeNames.KeyRing}>
<NavContainer navigationRef={navigationRef}>
<AnimatedComponentsProvider value={animatedComponents}>
<AuthProvider>
<NetworkProvider>
<ErrorModal enableReport />
<WitnessErrorDialogContainer />
<WebDisplay
destinationUrl={surveyMonkeyUrl}
exitUrl={surveyMonkeyExitUrl}
visible={surveyVisible}
onClose={() => setSurveyVisible(false)}
/>
<TourProvider tours={tours} overlayColor={'black'} overlayOpacity={0.7}>
<Root />
</TourProvider>
<Toast topOffset={15} config={toastConfig} />
</NetworkProvider>
</AuthProvider>
</AnimatedComponentsProvider>
</NavContainer>
</ThemeProvider>
</StoreProvider>
</ContainerProvider>
</ErrorBoundaryWrapper>
Expand Down
7 changes: 5 additions & 2 deletions app/Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
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.14.3'
gem 'activesupport', '~> 7.0.8'
# Exclude problematic versions of cocoapods and activesupport that cause build failures.
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
gem 'xcodeproj', '< 1.26.0'
gem 'concurrent-ruby', '< 1.3.4'
63 changes: 38 additions & 25 deletions app/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,27 +1,34 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.7)
CFPropertyList (3.0.9)
activesupport (7.1.6)
base64
nkf
rexml
activesupport (7.0.8)
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.0.2)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
mutex_m
securerandom (>= 0.3)
tzinfo (~> 2.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
addressable (2.9.0)
public_suffix (>= 2.0.2, < 8.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
base64 (0.2.0)
base64 (0.3.0)
benchmark (0.5.0)
bigdecimal (4.1.2)
claide (1.1.0)
cocoapods (1.14.3)
cocoapods (1.15.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.14.3)
cocoapods-core (= 1.15.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
Expand All @@ -36,7 +43,7 @@ GEM
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.23.0, < 2.0)
cocoapods-core (1.14.3)
cocoapods-core (1.15.2)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
Expand All @@ -56,47 +63,53 @@ GEM
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.2.2)
concurrent-ruby (1.3.3)
connection_pool (2.5.5)
drb (2.2.3)
escape (0.0.4)
ethon (0.16.0)
ethon (0.18.0)
ffi (>= 1.15.0)
ffi (1.17.1)
logger
ffi (1.17.4)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.9.0)
mutex_m
i18n (1.14.1)
i18n (1.14.8)
concurrent-ruby (~> 1.0)
json (2.10.2)
minitest (5.20.0)
json (2.20.0)
logger (1.7.0)
minitest (5.26.1)
molinillo (0.8.0)
mutex_m (0.3.0)
nanaimo (0.4.0)
nanaimo (0.3.0)
nap (1.1.0)
netrc (0.11.0)
nkf (0.2.0)
public_suffix (4.0.7)
rexml (3.4.1)
rexml (3.4.4)
ruby-macho (2.5.1)
typhoeus (1.4.1)
ethon (>= 0.9.0)
securerandom (0.3.2)
typhoeus (1.6.0)
ethon (>= 0.18.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
xcodeproj (1.27.0)
xcodeproj (1.25.1)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.4.0)
nanaimo (~> 0.3.0)
rexml (>= 3.3.6, < 4.0)

PLATFORMS
ruby

DEPENDENCIES
activesupport (~> 7.0.8)
cocoapods (~> 1.14.3)
activesupport (>= 6.1.7.5, != 7.1.0)
cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
concurrent-ruby (< 1.3.4)
xcodeproj (< 1.26.0)

RUBY VERSION
ruby 2.7.8p225
Expand Down
68 changes: 0 additions & 68 deletions app/__tests__/bcsc-theme/api/useConfigApi.test.ts

This file was deleted.

Loading
Loading