Skip to content

Commit

Permalink
Merge pull request #337 from privacyidea/v4.2.1
Browse files Browse the repository at this point in the history
V4.2.1
  • Loading branch information
frankmer authored Oct 27, 2023
2 parents fd415ff + 5084536 commit 61545b7
Show file tree
Hide file tree
Showing 187 changed files with 18,289 additions and 7,510 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/flutter_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- run: "flutter upgrade"
- run: "flutter --version"
- run: "flutter pub get"
- run: "flutter build ios --no-codesign"
- run: "flutter build ios -t 'lib/main_netknights.dart' --no-codesign"

build_appbundle:
name: (Android)
Expand All @@ -41,7 +41,7 @@ jobs:
# matrix job fails.
fail-fast: false
matrix:
api-level: [ 21,31 ] # [minSdk, most used, newest (30 is not working :(] 19 would be minSDK but does not support x86_64
api-level: [ 21, 30, 34 ] # [minSdk, most used, newest]
target: [ default ] # [default, google_apis]
steps:
- uses: actions/checkout@v2
Expand All @@ -56,5 +56,5 @@ jobs:
- run: "flutter --version"
- run: "flutter pub get"
- run: 'flutter clean'
- run: "flutter build apk --debug"
- run: "flutter build apk -t 'lib/main_netknights.dart' --debug"

35 changes: 35 additions & 0 deletions .github/workflows/test-integration.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Flutter integration test
on:
push:
branches:
- master
pull_request:
jobs:
drive_android:
runs-on: macos-latest
strategy:
matrix:
api-level: [29]
target: [playstore]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'

- uses: subosito/flutter-action@v1
with:
flutter-version: '3.13.2'
channel: 'stable'

# Run integration test
- name: Run Flutter Driver tests
uses: reactivecircus/android-emulator-runner@v2
with:
target: ${{ matrix.target }}
api-level: ${{ matrix.api-level }}
arch: x86_64
profile: Nexus 6
script: flutter test integration_test

3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
*.iws
.idea/

# Visual Studio Code related
.vscode/

# Flutter/Dart/Pub related
**/doc/api/
.dart_tool/
Expand Down
29 changes: 29 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "pi-authenticator (release mode)",
"request": "launch",
"type": "dart",
"program": "lib/main_netknights.dart",
"flutterMode": "release"
},
{
"name": "pi-authenticator (debug mode)",
"request": "launch",
"type": "dart",
"program": "lib/main_netknights.dart",
"flutterMode": "debug"
},
{
"name": "pi-authenticator (profile mode)",
"request": "launch",
"type": "dart",
"program": "lib/main_netknights.dart",
"flutterMode": "profile"
},
]
}
7 changes: 6 additions & 1 deletion analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
include: package:flutter_lints/flutter.yaml
include: package:flutter_lints/flutter.yaml

linter:
rules:
unnecessary_string_escapes: false
unnecessary_string_interpolations: false
13 changes: 13 additions & 0 deletions android/.settings/org.eclipse.buildship.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
arguments=--init-script C\:\\Users\\FRANKM~1\\AppData\\Local\\Temp\\d146c9752a26f79b52047fb6dc6ed385d064e120494f96f08ca63a317c41f94c.gradle --init-script C\:\\Users\\FRANKM~1\\AppData\\Local\\Temp\\52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
auto.sync=false
build.scans.enabled=false
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
connection.project.dir=
eclipse.preferences.version=1
gradle.user.home=
java.home=C\:/Program Files/Java/jdk-17
jvm.arguments=
offline.mode=false
override.workspace.settings=true
show.console.view=true
show.executions.view=true
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
android:exported="true"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
android:launchMode="singleTop"
android:launchMode="singleInstance"
android:theme="@style/LaunchTheme"
android:windowSoftInputMode="adjustResize">
<!-- Deep Links -->
Expand Down
Loading

0 comments on commit 61545b7

Please sign in to comment.