Skip to content
Merged
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
18 changes: 12 additions & 6 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,29 @@ jobs:
matrix:
node-version: [16.x]
steps:

- name: Check out code
uses: actions/checkout@v3

- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}


- name: Build Storage Mirror
run: |
cd storage-mirror
npm ci
npm run build

- name: Dependency install
run: |
npm install @ionic/cli@6.20.4 native-run@1.3.0
npm install

npm install @ionic/cli@6.20.4 native-run@1.3.0
npm install
npm install storage-mirror

- name: Build
run: |
./node_modules/@ionic/cli/bin/ionic build --prod --release

#- name: Test
# run: ./node_modules/@angular/cli/bin/ng test
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,6 @@ android/.idea/jarRepositories.xml
android/.idea/misc.xml
/src/environments/environment.prod.ts
ios/GoogleService-Info.plist
/tmp
/local_env
/storage-mirror
/tmp
2 changes: 1 addition & 1 deletion android/.idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ android {
namespace "in.beaconcha.mobile"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 114
versionName "4.5.12"
versionCode 121
versionName "4.5.20"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
1 change: 1 addition & 0 deletions android/app/capacitor.build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ dependencies {
implementation project(':capacitor-status-bar')
implementation project(':capacitor-toast')
implementation project(':capacitor-navigationbarnx')
implementation project(':storage-mirror')
implementation "com.android.billingclient:billing:7.0.0"
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* // Copyright (C) 2020 - 2021 Bitfly GmbH
* // Copyright (C) 2020 - 2021 bitfly explorer GmbH
* // Manuel Caspari (manuel@bitfly.at)
* //
* // This file is part of Beaconchain Dashboard.
Expand Down
4 changes: 4 additions & 0 deletions android/app/src/main/assets/capacitor.plugins.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,9 @@
{
"pkg": "capacitor-navigationbarnx",
"classpath": "com.nikosdouvlis.navigationbar.NavigationBar"
},
{
"pkg": "storage-mirror",
"classpath": "at.bitfly.storagemirror.StorageMirrorPlugin"
}
]
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* // Copyright (C) 2020 - 2021 Bitfly GmbH
* // Copyright (C) 2020 - 2021 bitfly explorer GmbH
* // Manuel Caspari (manuel@bitfly.at)
* //
* // This file is part of Beaconchain Dashboard.
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/java/in/beaconcha/mobile/widget
Submodule widget updated from 51c444 to 834ce8
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* // Copyright (C) 2020 - 2021 Bitfly GmbH
* // Copyright (C) 2020 - 2021 bitfly explorer GmbH
* // Manuel Caspari (manuel@bitfly.at)
* //
* // This file is part of Beaconchain Dashboard.
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.2.1'
classpath 'com.android.tools.build:gradle:8.8.2'
if (!getGradle().getStartParameter().getTaskRequests().toString().contains("Nogoogle")) {
classpath 'com.google.gms:google-services:4.4.0'
}
Expand Down
3 changes: 3 additions & 0 deletions android/capacitor.settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,6 @@ project(':capacitor-toast').projectDir = new File('../node_modules/@capacitor/to

include ':capacitor-navigationbarnx'
project(':capacitor-navigationbarnx').projectDir = new File('../node_modules/capacitor-navigationbarnx/android')

include ':storage-mirror'
project(':storage-mirror').projectDir = new File('../storage-mirror/android')
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion e2e/src/app.e2e-spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* // Copyright (C) 2020 - 2021 Bitfly GmbH
* // Copyright (C) 2020 - 2021 bitfly explorer GmbH
* // Manuel Caspari (manuel@bitfly.at)
* //
* // This file is part of Beaconchain Dashboard.
Expand Down
2 changes: 1 addition & 1 deletion e2e/src/app.po.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* // Copyright (C) 2020 - 2021 Bitfly GmbH
* // Copyright (C) 2020 - 2021 bitfly explorer GmbH
* // Manuel Caspari (manuel@bitfly.at)
* //
* // This file is part of Beaconchain Dashboard.
Expand Down
28 changes: 14 additions & 14 deletions ios/App/App.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -504,15 +504,15 @@
CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 110;
DEVELOPMENT_TEAM = 3HYX3N9WTV;
CURRENT_PROJECT_VERSION = 116;
DEVELOPMENT_TEAM = M6RLJ8D785;
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 4.5.5;
MARKETING_VERSION = 4.5.14;
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
PRODUCT_BUNDLE_IDENTIFIER = in.beaconcha.mobile;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -535,15 +535,15 @@
CODE_SIGN_ENTITLEMENTS = App/AppRelease.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 110;
DEVELOPMENT_TEAM = 3HYX3N9WTV;
CURRENT_PROJECT_VERSION = 116;
DEVELOPMENT_TEAM = M6RLJ8D785;
INFOPLIST_FILE = App/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 4.5.5;
MARKETING_VERSION = 4.5.14;
PRODUCT_BUNDLE_IDENTIFIER = in.beaconcha.mobile;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand All @@ -566,19 +566,19 @@
CODE_SIGN_ENTITLEMENTS = "Beaconchain WidgetExtension.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 110;
DEVELOPMENT_TEAM = 3HYX3N9WTV;
CURRENT_PROJECT_VERSION = 116;
DEVELOPMENT_TEAM = M6RLJ8D785;
INFOPLIST_FILE = "Beaconchain Widget/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 4.5.5;
MARKETING_VERSION = 4.5.14;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "in.beaconcha.mobile.Beaconchain-Widget";
PRODUCT_BUNDLE_IDENTIFIER = "in.beaconcha.mobile.Beaconchain-Widget2";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
Expand All @@ -598,18 +598,18 @@
CODE_SIGN_ENTITLEMENTS = "Beaconchain WidgetExtension.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 110;
DEVELOPMENT_TEAM = 3HYX3N9WTV;
CURRENT_PROJECT_VERSION = 116;
DEVELOPMENT_TEAM = M6RLJ8D785;
INFOPLIST_FILE = "Beaconchain Widget/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 4.5.5;
MARKETING_VERSION = 4.5.14;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = "in.beaconcha.mobile.Beaconchain-Widget";
PRODUCT_BUNDLE_IDENTIFIER = "in.beaconcha.mobile.Beaconchain-Widget2";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 5.0;
Expand Down
2 changes: 1 addition & 1 deletion ios/App/App/App.entitlements
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<string>development</string>
<key>com.apple.security.application-groups</key>
<array>
<string>group.in.beaconcha.mobile</string>
<string>group.in.beaconcha.mobile2</string>
</array>
</dict>
</plist>
2 changes: 1 addition & 1 deletion ios/App/App/AppDelegate.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* // Copyright (C) 2020 - 2021 Bitfly GmbH
* // Copyright (C) 2020 - 2021 bitfly explorer GmbH
* // Manuel Caspari (manuel@bitfly.at)
* //
* // This file is part of Beaconchain Dashboard.
Expand Down
2 changes: 1 addition & 1 deletion ios/App/App/AppRelease.entitlements
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<string>development</string>
<key>com.apple.security.application-groups</key>
<array>
<string>group.in.beaconcha.mobile</string>
<string>group.in.beaconcha.mobile2</string>
</array>
</dict>
</plist>
2 changes: 1 addition & 1 deletion ios/App/App/StorageMirror.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import Capacitor
public class StorageMirror: CAPPlugin {

let defaults = UserDefaults.standard
let shared = UserDefaults(suiteName: "group.in.beaconcha.mobile")
let shared = UserDefaults(suiteName: "group.in.beaconcha.mobile2")

@objc func reflect(_ call: CAPPluginCall) {
let keysToReflect = call.getArray("keys", String.self) ?? []
Expand Down
7 changes: 4 additions & 3 deletions ios/App/App/capacitor.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
"enabled": true
}
},
"server": {
"androidScheme": "http"
},
"android": {
"flavor": "prod"
},
"server": {
"androidScheme": "http"
},
"packageClassList": [
"OAuth2ClientPlugin",
"AppPlugin",
Expand All @@ -34,6 +34,7 @@
"StatusBarPlugin",
"ToastPlugin",
"NavigationBar",
"StorageMirrorPlugin",
"CDVPlugin"
]
}
2 changes: 1 addition & 1 deletion ios/App/Beaconchain WidgetExtension.entitlements
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<dict>
<key>com.apple.security.application-groups</key>
<array>
<string>group.in.beaconcha.mobile</string>
<string>group.in.beaconcha.mobile2</string>
</array>
</dict>
</plist>
1 change: 1 addition & 0 deletions ios/App/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ def capacitor_pods
pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar'
pod 'CapacitorToast', :path => '../../node_modules/@capacitor/toast'
pod 'CapacitorNavigationbarnx', :path => '../../node_modules/capacitor-navigationbarnx'
pod 'StorageMirror', :path => '../../storage-mirror'
pod 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
end

Expand Down
Loading