Skip to content

Commit

Permalink
Merge pull request #2 from SchweizerischeBundesbahnen/update-dart-flu…
Browse files Browse the repository at this point in the history
…tter-libs

Update dart, flutter, libs
  • Loading branch information
UlrichRaab authored Sep 13, 2024
2 parents 8b6901d + 87e9a0c commit 6270f6b
Show file tree
Hide file tree
Showing 12 changed files with 41 additions and 41 deletions.
2 changes: 1 addition & 1 deletion .fvmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"flutter": "3.22.2"
"flutter": "3.24.2"
}
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"dart.flutterSdkPath": ".fvm/versions/3.22.2",
"dart.flutterSdkPath": ".fvm/versions/3.24.2",
"dart.lineLength": 80,
"[dart]": {
"editor.rulers": [
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# sbb_oidc 3.3.0
# sbb_oidc 3.4.0

A Flutter plugin for OpenID Connect (OIDC).

Expand Down Expand Up @@ -195,7 +195,7 @@ sbb_oidc:
git:
url: https://github.com/SchweizerischeBundesbahnen/flutter-oidc.git
path: sbb_oidc
ref: 3.3.0
ref: 3.4.0
```
<a name="create-oidc-client"></a>
Expand Down
4 changes: 2 additions & 2 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ SPEC CHECKSUMS:
AppAuth: 182c5b88630569df5acb672720534756c29b3358
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
flutter_appauth: 1ce438877bc111c5d8f42da47729909290624886
flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46

PODFILE CHECKSUM: 7adbc9d59f05e1b01f554ea99b6c79e97f2214a2

Expand Down
2 changes: 1 addition & 1 deletion example/ios/Runner/AppDelegate.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import UIKit
import Flutter

@UIApplicationMain
@main
@objc class AppDelegate: FlutterAppDelegate {
override func application(
_ application: UIApplication,
Expand Down
4 changes: 2 additions & 2 deletions example/lib/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ class App extends StatelessWidget {
Widget build(BuildContext context) {
return MaterialApp(
themeMode: ThemeMode.system,
theme: SBBTheme.light(hostPlatform: HostPlatform.native),
darkTheme: SBBTheme.dark(hostPlatform: HostPlatform.native),
theme: SBBTheme.light(),
darkTheme: SBBTheme.dark(),
home: const EntryPage(),
);
}
Expand Down
10 changes: 5 additions & 5 deletions example/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: sbb_oidc_example
description: Demonstrates how to use the sbb_oidc plugin.
publish_to: 'none'
version: 3.3.0
version: 3.4.0


environment:
sdk: '>=3.3.4 <4.0.0'
sdk: '>=3.5.2 <4.0.0'


dependencies:
Expand All @@ -17,7 +17,7 @@ dependencies:
design_system_flutter:
git:
url: https://github.com/SchweizerischeBundesbahnen/design_system_flutter.git
ref: 1.4.0
ref: 2.0.0
# https://pub.dev/packages/collection
collection: ^1.18.0
# https://pub.dev/packages/fimber
Expand All @@ -29,9 +29,9 @@ dependencies:
# https://pub.dev/packages/get_it
get_it: ^7.7.0
# https://pub.dev/packages/http
http: ^1.2.1
http: ^1.2.2
# https://pub.dev/packages/meta
meta: ^1.12.0
meta: ^1.15.0
# https://pub.dev/packages/rxdart
rxdart: ^0.28.0

Expand Down
18 changes: 9 additions & 9 deletions sbb_oidc/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: sbb_oidc
description: SBB OpenID Connect plugin for Flutter
homepage: https://code.sbb.ch/projects/KD_FLUTTER/repos/esta_mobile_flutter_oidc
homepage: https://github.com/SchweizerischeBundesbahnen/flutter-oidc
publish_to: none
version: 3.3.0
version: 3.4.0


environment:
sdk: '>=3.3.4 <4.0.0'
sdk: '>=3.5.2 <4.0.0'


flutter:
Expand All @@ -27,28 +27,28 @@ dependencies:
git:
url: https://github.com/SchweizerischeBundesbahnen/flutter-oidc.git
path: sbb_oidc_platform_interface
ref: 3.3.0
ref: 3.4.0
sbb_oidc_mobile:
git:
url: https://github.com/SchweizerischeBundesbahnen/flutter-oidc.git
path: sbb_oidc_mobile
ref: 3.3.0
ref: 3.4.0
sbb_oidc_web:
git:
url: https://github.com/SchweizerischeBundesbahnen/flutter-oidc.git
path: sbb_oidc_web
ref: 3.3.0
ref: 3.4.0
# https://pub.dev/packages/http
http: ^1.2.1
http: ^1.2.2
# https://pub.dev/packages/meta
meta: ^1.12.0
meta: ^1.15.0


dev_dependencies:
flutter_test:
sdk: flutter
# https://pub.dev/packages/build_runner
build_runner: ^2.4.11
build_runner: ^2.4.12
# https://pub.dev/packages/flutter_lints
flutter_lints: ^4.0.0
# https://pub.dev/packages/mockito
Expand Down
6 changes: 3 additions & 3 deletions sbb_oidc_mobile/lib/src/oidc_service_impl.dart
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ class OidcServiceImpl extends OidcService {
);
try {
final response = await _appAuth.authorizeAndExchangeCode(request);
return response!.oidcToken;
return response.oidcToken;
} on PlatformException catch (e) {
// Convert platform exception to more specific exception.
throw e.convert();
Expand All @@ -163,7 +163,7 @@ class OidcServiceImpl extends OidcService {

try {
final response = await _appAuth.token(request);
return response!.oidcToken;
return response.oidcToken;
} on PlatformException catch (e) {
// Convert platform exception to more specific exception.
throw e.convert();
Expand All @@ -182,7 +182,7 @@ class OidcServiceImpl extends OidcService {

try {
final response = await _appAuth.token(request);
return response!.oidcToken;
return response.oidcToken;
} on PlatformException catch (e) {
// Convert platform exception to more specific exception.
throw e.convert();
Expand Down
12 changes: 6 additions & 6 deletions sbb_oidc_mobile/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: sbb_oidc_mobile
description: Mobile (Android and iOS) implementation of the sbb_oidc plugin.
homepage: https://code.sbb.ch/projects/KD_FLUTTER/repos/esta_mobile_flutter_oidc
homepage: https://github.com/SchweizerischeBundesbahnen/flutter-oidc
publish_to: none
version: 3.3.0
version: 3.4.0


environment:
sdk: '>=3.4.3 <4.0.0'
sdk: '>=3.5.2 <4.0.0'


flutter:
Expand All @@ -28,13 +28,13 @@ dependencies:
git:
url: https://github.com/SchweizerischeBundesbahnen/flutter-oidc.git
path: sbb_oidc_platform_interface
ref: 3.3.0
ref: 3.4.0
# https://pub.dev/packages/flutter_appauth
flutter_appauth: ^6.0.6
flutter_appauth: ^7.0.0
# https://pub.dev/packages/flutter_secure_storage
flutter_secure_storage: ^9.2.2
# https://pub.dev/packages/http
http: ^1.2.1
http: ^1.2.2


dev_dependencies:
Expand Down
10 changes: 5 additions & 5 deletions sbb_oidc_platform_interface/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: sbb_oidc_platform_interface
description: A common platform interface for the sbb_oidc plugin.
homepage: https://code.sbb.ch/projects/KD_FLUTTER/repos/esta_mobile_flutter_oidc
homepage: https://github.com/SchweizerischeBundesbahnen/flutter-oidc
publish_to: none
version: 3.3.0
version: 3.4.0


environment:
sdk: '>=3.4.3 <4.0.0'
sdk: '>=3.5.2 <4.0.0'


dependencies:
Expand All @@ -17,7 +17,7 @@ dependencies:
# https://pub.dev/packages/json_annotation
json_annotation: ^4.9.0
# https://pub.dev/packages/meta
meta: ^1.12.0
meta: ^1.15.0
# https://pub.dev/packages/plugin_platform_interface
plugin_platform_interface: ^2.1.8

Expand All @@ -26,7 +26,7 @@ dev_dependencies:
flutter_test:
sdk: flutter
# https://pub.dev/packages/build_runner
build_runner: ^2.4.11
build_runner: ^2.4.12
# https://pub.dev/packages/flutter_lints
flutter_lints: ^4.0.0
# https://pub.dev/packages/json_serializable
Expand Down
8 changes: 4 additions & 4 deletions sbb_oidc_web/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
name: sbb_oidc_web
description: Web implementation of the sbb_oidc plugin.
homepage: https://code.sbb.ch/projects/KD_FLUTTER/repos/esta_mobile_flutter_oidc
homepage: https://github.com/SchweizerischeBundesbahnen/flutter-oidc
publish_to: none
version: 3.3.0
version: 3.4.0


environment:
sdk: '>=3.4.3 <4.0.0'
sdk: '>=3.5.2 <4.0.0'


flutter:
Expand All @@ -26,7 +26,7 @@ dependencies:
git:
url: https://github.com/SchweizerischeBundesbahnen/flutter-oidc.git
path: sbb_oidc_platform_interface
ref: 3.3.0
ref: 3.4.0
# https://pub.dev/packages/msal_js
msal_js: ^2.14.0

Expand Down

0 comments on commit 6270f6b

Please sign in to comment.