Skip to content

Commit 6ba81eb

Browse files
Merge branch 'av/openid_git_dependency_fix' of https://github.com/anusii/solid-auth into av/openid_git_dependency_fix
2 parents 578b445 + 5e05873 commit 6ba81eb

File tree

6 files changed

+11
-9
lines changed

6 files changed

+11
-9
lines changed

lib/src/auth_manager/auth_manager_abstract.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
/// Authors: Anushka Vidanage
2828
library;
2929

30-
// import just for the client class. Not used anywhere else.
31-
import 'package:solid_auth/src/openid/src/openid.dart';
3230
import 'package:solid_auth/src/auth_manager/auth_manager_stub.dart'
3331
if (dart.library.html) 'web_auth_manager.dart';
32+
// import just for the client class. Not used anywhere else.
33+
import 'package:solid_auth/src/openid/src/openid.dart';
3434

3535
abstract class AuthManager {
3636
// some generic methods to be exposed.

lib/src/auth_manager/web_auth_manager.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ library;
3030
import 'package:openidconnect_web/openidconnect_web.dart';
3131
import 'package:web/web.dart' hide Client;
3232

33-
import 'package:solid_auth/src/openid/openid_client_browser.dart';
3433
import 'package:solid_auth/src/auth_manager/auth_manager_abstract.dart';
34+
import 'package:solid_auth/src/openid/openid_client_browser.dart';
3535

3636
late Window windowLoc;
3737

lib/src/openid/openid_client_browser.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,13 @@
2323
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2424
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2525

26+
import 'dart:async';
2627
import 'dart:js_interop';
2728

28-
import 'openid_client.dart';
2929
import 'package:web/web.dart' hide Credential, Client;
30-
import 'dart:async';
30+
31+
import 'openid_client.dart';
32+
3133
export 'openid_client.dart';
3234

3335
/// A wrapper around [Flow] that handles the browser-specific parts of

lib/src/openid/openid_client_io.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
library openid_client.io;
2828

2929
import 'dart:async';
30-
import 'dart:io';
3130
import 'dart:developer';
31+
import 'dart:io';
3232

3333
import 'openid_client.dart';
3434

lib/src/openid/src/model.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828

2929
library openid.model;
3030

31-
import 'package:jose/src/util.dart';
32-
import 'package:jose/jose.dart';
3331
import 'package:clock/clock.dart';
32+
import 'package:jose/jose.dart';
33+
import 'package:jose/src/util.dart';
3434

3535
part 'model/metadata.dart';
3636

support/flutter.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ todo:
285285
license:
286286
@echo "Files without a LICENSE:\n"
287287
@-output=$$(find lib -type f -not -name '*~' -not -name 'README*' -not -name '*.g.dart' \
288-
! -exec grep -qE '^(/// Copyright|/// Licensed)' {} \; -print | xargs printf "\t%s\n"); \
288+
! -exec grep -qE '^(///? Copyright|///? Licensed)' {} \; -print | xargs printf "\t%s\n"); \
289289
if [ $$(echo "$$output" | wc -w) -ne 0 ]; then \
290290
echo "$$output"; \
291291
echo "\n$(CROSS) Error: Files with no license found."; \

0 commit comments

Comments
 (0)