Skip to content

Commit

Permalink
Merge pull request #1817 from bitmark-inc/merge_develop
Browse files Browse the repository at this point in the history
merge develop to security audit
  • Loading branch information
phuocbitmark authored Jul 10, 2024
2 parents 48c37a6 + 5a56060 commit 9fcdb17
Show file tree
Hide file tree
Showing 236 changed files with 10,571 additions and 12,292 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/auto_test_android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ jobs:
- name: Checkout code
uses: actions/checkout@v3
# Set build number
- uses: subosito/flutter-action@v2
with:
flutter-version: "3.22.1"
channel: stable
- name: Set env
run: |
echo "FLUTTER_VERSION_NAME=0.100.0" >> $GITHUB_ENV
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/auto_test_ios.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ jobs:
- name: Checkout code
uses: actions/checkout@v3
# Set build number
- uses: subosito/flutter-action@v2
with:
flutter-version: "3.22.1"
channel: stable
- name: Set env
run: |
echo "FLUTTER_VERSION_NAME=0.100.0" >> $GITHUB_ENV
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bmvn_build_appcenter_android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ on:
description: Using testnet (Default staging)
jobs:
build:
runs-on: [ self-hosted, macm2, build-ci-local-bmvn, android ]
runs-on: [self-hosted, macm2, build-ci-local-bmvn, android]
steps:
- name: Extract Build number for Testnet
id: extract-version-testnet
Expand All @@ -57,7 +57,7 @@ jobs:
java-version: "17"
- uses: subosito/flutter-action@v2
with:
flutter-version: "3.19.0"
flutter-version: "3.22.1"
channel: stable
- name: Set env
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bmvn_build_appcenter_ios.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ on:

jobs:
fastlane-deploy:
runs-on: [ self-hosted, macm2, build-ci-local-bmvn, ios ]
runs-on: [self-hosted, macm2, build-ci-local-bmvn, ios]
steps:
# Set up Flutter.
- name: Clone Flutter repository with master channel
uses: subosito/flutter-action@v2
with:
flutter-version: "3.19.0"
flutter-version: "3.22.1"
channel: stable
# - uses: maxim-lobanov/setup-xcode@v1
# with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios-release-appcenter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Clone Flutter repository with master channel
uses: subosito/flutter-action@v2
with:
flutter-version: "3.19.0"
flutter-version: "3.22.1"
channel: stable
- uses: maxim-lobanov/setup-xcode@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios-release-testflight.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Clone Flutter repository with master channel
uses: subosito/flutter-action@v2
with:
flutter-version: "3.19.0"
flutter-version: "3.22.1"
channel: stable
- uses: maxim-lobanov/setup-xcode@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ samples, guidance on mobile development, and a full API reference.
- [App Store](https://apps.apple.com/us/app/feral-file/id1544022728)
- [Google Play](https://play.google.com/store/apps/details?id=com.bitmark.autonomy_client&pli=)

[Release Notes](https://github.com/bitmark-inc/autonomy-apps/tree/main/release_notes/production)
[Release Notes](https://github.com/bitmark-inc/feral-file-docs/blob/master/app/release_notes/production/changelog.md)

## Contributing

Expand Down
2 changes: 1 addition & 1 deletion assets
3 changes: 2 additions & 1 deletion ios/Runner-Inhouse-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<string>tezos</string>
<string>autonomy-wc</string>
<string>autonomy-app</string>
<string>feralfile</string>
<string>feralfile</string>
</array>
</dict>
</array>
Expand All @@ -59,6 +59,7 @@
<array>
<string>_googlecast._tcp</string>
<string>_YOUR_APP_ID._googlecast._tcp</string>
<string>_feralFileCanvas._tcp</string>
</array>
<key>NSCameraUsageDescription</key>
<string>QR code scanning requires camera access.</string>
Expand Down
3 changes: 2 additions & 1 deletion ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<string>tezos</string>
<string>autonomy-wc</string>
<string>autonomy-app</string>
<string>feralfile</string>
<string>feralfile</string>
</array>
</dict>
</array>
Expand All @@ -64,6 +64,7 @@
<array>
<string>_googlecast._tcp</string>
<string>_YOUR_APP_ID._googlecast._tcp</string>
<string>_feralFileCanvas._tcp</string>
</array>
<key>NSCameraUsageDescription</key>
<string>QR code scanning requires camera access.</string>
Expand Down
Binary file not shown.
Binary file not shown.
7 changes: 4 additions & 3 deletions lib/common/environment.dart
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ class Environment {
? connectWebsocketTestnetURL
: connectWebsocketMainnetURL;

static String get tvCastApiUrl => dotenv.env['TV_CAST_API_URL'] ?? '';

static String get tokenWebviewPrefix =>
dotenv.env['TOKEN_WEBVIEW_PREFIX'] ?? '';

Expand Down Expand Up @@ -151,9 +153,6 @@ class Environment {

static String get tzktTestnetURL => dotenv.env['TZKT_TESTNET_URL'] ?? '';

static String get autonomyAirdropURL =>
dotenv.env['AUTONOMY_AIRDROP_URL'] ?? '';

static String get autonomyAirDropContractAddress =>
dotenv.env['AUTONOMY_AIRDROP_CONTRACT_ADDRESS'] ?? '';

Expand Down Expand Up @@ -187,6 +186,8 @@ class Environment {
static String get sentryDSN => cachedSecretEnv['SENTRY_DSN'] ?? '';

static String get onesignalAppID => cachedSecretEnv['ONESIGNAL_APP_ID'] ?? '';

static String get tvKey => cachedSecretEnv['TV_API_KEY'] ?? '';
}

class Secret {
Expand Down
Loading

0 comments on commit 9fcdb17

Please sign in to comment.