Skip to content

Commit

Permalink
Merge pull request #416 from penguin-statistics/dev
Browse files Browse the repository at this point in the history
Release v3.4.1
  • Loading branch information
AlvISsReimu authored Jan 6, 2021
2 parents e4e9bb3 + 295419f commit 61d2086
Show file tree
Hide file tree
Showing 259 changed files with 5,980 additions and 900 deletions.
7 changes: 4 additions & 3 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"root": true,
"globals": {
"GIT_COMMIT": true,
"PENGUIN_BUILD": true,
"PENGUIN_BUILD_FROM": true
"PENGUIN_PLATFORM": true,
"PENGUIN_PLATFORM_FROM": true
},
"env": {
"node": true
Expand All @@ -18,7 +18,8 @@
"vuetify/grid-unknown-attributes": "error",
"vuetify/no-legacy-grid": "error",
"vue/no-v-html": "off",
"vue/no-template-shadow": "off"
"vue/no-template-shadow": "off",
"vue/valid-template-root": "off"
},
"parserOptions": {
"parser": "babel-eslint"
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cache:
directories:
- node_modules
env:
- PENGUIN_BUILD_FROM=travis
- PENGUIN_PLATFORM_FROM=travis
script:
- yarn lint
- yarn build:web
Expand Down
1,242 changes: 1,242 additions & 0 deletions CREDITS.md

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion android/app/src/main/assets/capacitor.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@
"plugins": {
"SplashScreen": {
"launchAutoHide": false,
"showSpinner": true
"backgroundColor": "#000000ff",
"showSpinner": true,
"spinnerColor": "#fff"
},
"PushNotifications": {
"presentationOptions": ["badge", "sound", "alert"]
}
},
"cordova": {}
Expand Down
7 changes: 6 additions & 1 deletion capacitor.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@
"plugins": {
"SplashScreen": {
"launchAutoHide": false,
"showSpinner": true
"backgroundColor": "#000000ff",
"showSpinner": true,
"spinnerColor": "#fff"
},
"PushNotifications": {
"presentationOptions": ["badge", "sound", "alert"]
}
},
"cordova": {}
Expand Down
360 changes: 312 additions & 48 deletions ios/App/App.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1230"
wasCreatedForAppExtension = "YES"
version = "2.0">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3A1157AB258F2B5C00F4C6FD"
BuildableName = "PenguinWidgetExtension.appex"
BlueprintName = "PenguinWidgetExtension"
ReferencedContainer = "container:App.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "504EC3031FED79650016851F"
BuildableName = "App.app"
BlueprintName = "App"
ReferencedContainer = "container:App.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = ""
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
launchStyle = "0"
askForAppToLaunch = "Yes"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES"
launchAutomaticallySubstyle = "2">
<RemoteRunnable
runnableDebuggingMode = "2"
BundleIdentifier = "com.apple.springboard">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3A1157AB258F2B5C00F4C6FD"
BuildableName = "PenguinWidgetExtension.appex"
BlueprintName = "PenguinWidgetExtension"
ReferencedContainer = "container:App.xcodeproj">
</BuildableReference>
</RemoteRunnable>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "504EC3031FED79650016851F"
BuildableName = "App.app"
BlueprintName = "App"
ReferencedContainer = "container:App.xcodeproj">
</BuildableReference>
</MacroExpansion>
<EnvironmentVariables>
<EnvironmentVariable
key = "_XCWidgetKind"
value = ""
isEnabled = "NO">
</EnvironmentVariable>
<EnvironmentVariable
key = "_XCWidgetDefaultView"
value = "timeline"
isEnabled = "NO">
</EnvironmentVariable>
<EnvironmentVariable
key = "_XCWidgetFamily"
value = "medium"
isEnabled = "NO">
</EnvironmentVariable>
</EnvironmentVariables>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES"
launchAutomaticallySubstyle = "2">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "504EC3031FED79650016851F"
BuildableName = "App.app"
BlueprintName = "App"
ReferencedContainer = "container:App.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
34 changes: 34 additions & 0 deletions ios/App/App.xcworkspace/xcshareddata/swiftpm/Package.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"object": {
"pins": [
{
"package": "Alamofire",
"repositoryURL": "https://github.com/Alamofire/Alamofire",
"state": {
"branch": null,
"revision": "eaf6e622dd41b07b251d8f01752eab31bc811493",
"version": "5.4.1"
}
},
{
"package": "RxBus",
"repositoryURL": "https://github.com/ridi/RxBus-Swift",
"state": {
"branch": null,
"revision": "542c47d46682a64867315867f45403a616ca40b0",
"version": "1.3.1"
}
},
{
"package": "RxSwift",
"repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
"state": {
"branch": null,
"revision": "002d325b0bdee94e7882e1114af5ff4fe1e96afa",
"version": "5.1.1"
}
}
]
},
"version": 1
}
12 changes: 12 additions & 0 deletions ios/App/App/App.entitlements
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,26 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>aps-environment</key>
<string>development</string>
<key>com.apple.developer.associated-domains</key>
<array>
<string>applinks:penguin-stats.io</string>
<string>applinks:penguin-stats.cn</string>
<string>activitycontinuation:penguin-stats.io</string>
<string>activitycontinuation:penguin-stats.cn</string>
</array>
<key>com.apple.security.app-sandbox</key>
<true/>
<key>com.apple.security.device.audio-input</key>
<true/>
<key>com.apple.security.device.camera</key>
<true/>
<key>com.apple.security.network.client</key>
<true/>
<key>com.apple.security.personal-information.location</key>
<true/>
<key>com.apple.security.personal-information.photos-library</key>
<true/>
</dict>
</plist>
Loading

0 comments on commit 61d2086

Please sign in to comment.