flutter/GitJournal
1
0
Fork 0
mirror of https://github.com/GitJournal/GitJournal.git synced 2025-06-27 17:29:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bump deps for Flutter 2

Browse Source 
Also for handling the latest dart-git. This required disabling -
* ssh_key - Feature toggle (off by default) for generating the ssh key
in dart. This was causing problems.
* screenshots
* flutter_driver - used by screenshots

flutter_driver was nice to have as it was the only proper integration
test that we have.

Also, many of the tests currently fail because of problems with Sentry.
I prefer to fix those in another commit
This commit is contained in:
Vishesh Handa
2021-03-25 11:05:42 +01:00
parent 445f35ab64
commit 78b25af47a
11 changed files with 191 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/apis/github.dart
View File

@ -53,8 +53,8 @@ class GitHub implements GitHost {
} }
Future<String> _getAccessCode(String authCode) async { Future<String> _getAccessCode(String authCode) async {
var url = var url = Uri.parse(
"https://github.com/login/oauth/access_token?client_id=$_clientID&client_secret=$_clientSecret&code=$authCode"; "https://github.com/login/oauth/access_token?client_id=$_clientID&client_secret=$_clientSecret&code=$authCode");
var response = await http.post(url); var response = await http.post(url);
if (response.statusCode != 200) { if (response.statusCode != 200) {
@ -86,7 +86,8 @@ class GitHub implements GitHost {
throw GitHostException.MissingAccessCode; throw GitHostException.MissingAccessCode;
} }
var url = "https://api.github.com/user/repos?page=1&per_page=100"; var url =
Uri.parse("https://api.github.com/user/repos?page=1&per_page=100");
var headers = { var headers = {
HttpHeaders.authorizationHeader: _buildAuthHeader(), HttpHeaders.authorizationHeader: _buildAuthHeader(),
}; };
@ -122,7 +123,7 @@ class GitHub implements GitHost {
throw GitHostException.MissingAccessCode; throw GitHostException.MissingAccessCode;
} }
var url = "https://api.github.com/user/repos"; var url = Uri.parse("https://api.github.com/user/repos");
var data = <String, dynamic>{ var data = <String, dynamic>{
'name': name, 'name': name,
'private': true, 'private': true,
@ -163,7 +164,7 @@ class GitHub implements GitHost {
var userInfo = await getUserInfo(); var userInfo = await getUserInfo();
var owner = userInfo.username; var owner = userInfo.username;
var url = "https://api.github.com/repos/$owner/$name"; var url = Uri.parse("https://api.github.com/repos/$owner/$name");
var headers = { var headers = {
HttpHeaders.authorizationHeader: _buildAuthHeader(), HttpHeaders.authorizationHeader: _buildAuthHeader(),
@ -190,7 +191,7 @@ class GitHub implements GitHost {
throw GitHostException.MissingAccessCode; throw GitHostException.MissingAccessCode;
} }
var url = "https://api.github.com/repos/$repo/keys"; var url = Uri.parse("https://api.github.com/repos/$repo/keys");
var data = <String, dynamic>{ var data = <String, dynamic>{
'title': "GitJournal", 'title': "GitJournal",
@ -265,7 +266,7 @@ class GitHub implements GitHost {
throw GitHostException.MissingAccessCode; throw GitHostException.MissingAccessCode;
} }
var url = "https://api.github.com/user"; var url = Uri.parse("https://api.github.com/user");
var headers = { var headers = {
HttpHeaders.authorizationHeader: _buildAuthHeader(), HttpHeaders.authorizationHeader: _buildAuthHeader(),

18
lib/apis/gitlab.dart
View File

@ -75,8 +75,8 @@ class GitLab implements GitHost {
} }
// FIXME: pagination! // FIXME: pagination!
var url = var url = Uri.parse(
"https://gitlab.com/api/v4/projects?simple=true&membership=true&order_by=last_activity_at&access_token=$_accessCode"; "https://gitlab.com/api/v4/projects?simple=true&membership=true&order_by=last_activity_at&access_token=$_accessCode");
if (foundation.kDebugMode) { if (foundation.kDebugMode) {
print(toCurlCommand(url, {})); print(toCurlCommand(url, {}));
@ -109,7 +109,8 @@ class GitLab implements GitHost {
throw GitHostException.MissingAccessCode; throw GitHostException.MissingAccessCode;
} }
var url = "https://gitlab.com/api/v4/projects?access_token=$_accessCode"; var url = Uri.parse(
"https://gitlab.com/api/v4/projects?access_token=$_accessCode");
var data = <String, dynamic>{ var data = <String, dynamic>{
'name': name, 'name': name,
'visibility': 'private', 'visibility': 'private',
@ -149,8 +150,8 @@ class GitLab implements GitHost {
var userInfo = await getUserInfo(); var userInfo = await getUserInfo();
var repo = userInfo.username + '%2F' + name; var repo = userInfo.username + '%2F' + name;
var url = var url = Uri.parse(
"https://gitlab.com/api/v4/projects/$repo?access_token=$_accessCode"; "https://gitlab.com/api/v4/projects/$repo?access_token=$_accessCode");
var response = await http.get(url); var response = await http.get(url);
if (response.statusCode != 200) { if (response.statusCode != 200) {
@ -174,8 +175,8 @@ class GitLab implements GitHost {
} }
repo = repo.replaceAll('/', '%2F'); repo = repo.replaceAll('/', '%2F');
var url = var url = Uri.parse(
"https://gitlab.com/api/v4/projects/$repo/deploy_keys?access_token=$_accessCode"; "https://gitlab.com/api/v4/projects/$repo/deploy_keys?access_token=$_accessCode");
var data = { var data = {
'title': "GitJournal", 'title': "GitJournal",
@ -249,7 +250,8 @@ class GitLab implements GitHost {
throw GitHostException.MissingAccessCode; throw GitHostException.MissingAccessCode;
} }
var url = "https://gitlab.com/api/v4/user?access_token=$_accessCode"; var url =
Uri.parse("https://gitlab.com/api/v4/user?access_token=$_accessCode");
var response = await http.get(url); var response = await http.get(url);
if (response.statusCode != 200) { if (response.statusCode != 200) {

2
lib/iap.dart
View File

@ -194,7 +194,7 @@ Future<DateTime> getExpiryDate(
}; };
Log.i("getExpiryDate ${json.encode(body)}"); Log.i("getExpiryDate ${json.encode(body)}");
var url = Platform.isIOS ? ios_url : android_url; var url = Uri.parse(Platform.isIOS ? ios_url : android_url);
var response = await http.post(url, body: json.encode(body)); var response = await http.post(url, body: json.encode(body));
if (response.statusCode != 200) { if (response.statusCode != 200) {
Log.e("Received Invalid Status Code from GCP IAP Verify", props: { Log.e("Received Invalid Status Code from GCP IAP Verify", props: {

10
lib/screens/login_screen.dart
View File

@ -33,10 +33,11 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:gotrue/gotrue.dart';
import 'package:gitjournal/widgets/scroll_view_without_animation.dart'; import 'package:gitjournal/widgets/scroll_view_without_animation.dart';
//import 'package:gotrue/gotrue.dart';
const _localDevServer = 'http://192.168.1.130:9999/'; const _localDevServer = 'http://192.168.1.130:9999/';
// const _prodServer = 'https://api.gitjournal.io/auth/'; // const _prodServer = 'https://api.gitjournal.io/auth/';
@ -50,14 +51,15 @@ class LoginPage extends StatefulWidget {
} }
class _LoginPageState extends State<LoginPage> { class _LoginPageState extends State<LoginPage> {
var goTrue = GoTrue(_localDevServer); //var goTrue = GoTrue(_localDevServer);
Future<void> _loginAction() async { Future<void> _loginAction() async {
var t = await goTrue.login('handa.vish@gmail.com', 'blah'); /*var t = await goTrue.login('handa.vish@gmail.com', 'blah');
print("Got Token: $t"); print("Got Token: $t");
var user = await goTrue.user(t.accessToken); var user = await goTrue.user(t.accessToken);
print("Got usre: $user"); print("Got usre: $user");
*/
} }
Widget _submitButton() { Widget _submitButton() {

9
lib/ssh/keygen.dart
View File

@ -23,12 +23,12 @@ final bool useDartKeyGen = false;
Future<SshKey> generateSSHKeys({@required String comment}) async { Future<SshKey> generateSSHKeys({@required String comment}) async {
if (useDartKeyGen) { if (useDartKeyGen) {
return generateSSHKeysDart(comment: comment); //return generateSSHKeysDart(comment: comment);
} else { } else {}
return generateSSHKeysNative(comment: comment); return generateSSHKeysNative(comment: comment);
}
} }
/*
Future<SshKey> generateSSHKeysDart({@required String comment}) async { Future<SshKey> generateSSHKeysDart({@required String comment}) async {
try { try {
var stopwatch = Stopwatch()..start(); var stopwatch = Stopwatch()..start();
@ -46,6 +46,7 @@ Future<SshKey> generateSSHKeysDart({@required String comment}) async {
return null; return null;
} }
*/
Future<SshKey> generateSSHKeysNative({@required String comment}) async { Future<SshKey> generateSSHKeysNative({@required String comment}) async {
try { try {

4
lib/ssh/rsa_key_pair.dart
View File

@ -1,10 +1,11 @@
/*
import 'dart:async'; import 'dart:async';
import 'dart:convert'; import 'dart:convert';
import 'package:crypton/crypton.dart'; import 'package:crypton/crypton.dart';
import 'package:isolate/isolate_runner.dart'; import 'package:isolate/isolate_runner.dart';
import 'package:meta/meta.dart'; import 'package:meta/meta.dart';
import 'package:ssh_key/ssh_key.dart' as ssh_key;
import 'package:gitjournal/error_reporting.dart'; import 'package:gitjournal/error_reporting.dart';
import 'package:gitjournal/ssh/binary_length_value.dart'; import 'package:gitjournal/ssh/binary_length_value.dart';
@ -122,3 +123,4 @@ class RsaKeyPair {
FutureOr<RsaKeyPair> _gen(void _) async { FutureOr<RsaKeyPair> _gen(void _) async {
return RsaKeyPair.generate(); return RsaKeyPair.generate();
} }
*/

2
lib/utils.dart
View File

@ -81,7 +81,7 @@ bool folderWithSpecExists(BuildContext context, String spec) {
return rootFolder.getFolderWithSpec(spec) != null; return rootFolder.getFolderWithSpec(spec) != null;
} }
String toCurlCommand(String url, Map<String, String> headers) { String toCurlCommand(Uri url, Map<String, String> headers) {
var headersStr = ""; var headersStr = "";
headers.forEach((key, value) { headers.forEach((key, value) {
headersStr += ' -H "$key: $value" '; headersStr += ' -H "$key: $value" ';

323
pubspec.lock
View File

@ -7,28 +7,28 @@ packages:
name: _fe_analyzer_shared name: _fe_analyzer_shared
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "6.0.0" version: "14.0.0"
analyzer: analyzer:
dependency: transitive dependency: transitive
description: description:
name: analyzer name: analyzer
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.39.16" version: "0.41.2"
archive: archive:
dependency: transitive dependency: transitive
description: description:
name: archive name: archive
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.13" version: "3.1.2"
args: args:
dependency: transitive dependency: transitive
description: description:
name: args name: args
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.6.0" version: "2.0.0"
asn1lib: asn1lib:
dependency: transitive dependency: transitive
description: description:
@ -84,14 +84,14 @@ packages:
name: buffer name: buffer
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.7" version: "1.1.0"
cached_network_image: cached_network_image:
dependency: "direct main" dependency: "direct main"
description: description:
name: cached_network_image name: cached_network_image
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.2.0+1" version: "2.5.1"
characters: characters:
dependency: transitive dependency: transitive
description: description:
@ -127,13 +127,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.15.0" version: "1.15.0"
colorize:
dependency: transitive
description:
name: colorize
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
connectivity: connectivity:
dependency: "direct main" dependency: "direct main"
description: description:
@ -147,7 +140,7 @@ packages:
name: convert name: convert
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.1" version: "3.0.0"
coverage: coverage:
dependency: transitive dependency: transitive
description: description:
@ -161,7 +154,7 @@ packages:
name: crypto name: crypto
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.5" version: "3.0.0"
crypton: crypton:
dependency: "direct main" dependency: "direct main"
description: description:
@ -169,26 +162,19 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.3" version: "1.1.3"
csslib:
dependency: transitive
description:
name: csslib
url: "https://pub.dartlang.org"
source: hosted
version: "0.16.1"
csv: csv:
dependency: transitive dependency: transitive
description: description:
name: csv name: csv
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "4.0.3" version: "5.0.0"
dart_git: dart_git:
dependency: "direct main" dependency: "direct main"
description: description:
path: "." path: "."
ref: HEAD ref: HEAD
resolved-ref: df7d1133704c04aa2859cb5cf46a9849af7642ac resolved-ref: df106293ab0bf6a47b2facb17aa85348a14cfca1
url: "https://github.com/GitJournal/dart-git.git" url: "https://github.com/GitJournal/dart-git.git"
source: git source: git
version: "0.0.2" version: "0.0.2"
@ -199,13 +185,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.4.2+4" version: "0.4.2+4"
dio:
dependency: transitive
description:
name: dio
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.10"
dots_indicator: dots_indicator:
dependency: "direct main" dependency: "direct main"
description: description:
@ -219,11 +198,20 @@ packages:
name: easy_localization name: easy_localization
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.3.3+1" version: "3.0.0"
easy_localization_loader: easy_localization_loader:
dependency: "direct main" dependency: "direct main"
description: description:
name: easy_localization_loader path: "."
ref: HEAD
resolved-ref: ee40519e77e2662592da6cb4a4a6fa1318245615
url: "https://github.com/aissat/easy_localization_loader"
source: git
version: "1.0.0"
easy_logger:
dependency: transitive
description:
name: easy_logger
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.2" version: "0.0.2"
@ -240,7 +228,7 @@ packages:
name: equatable name: equatable
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.5" version: "2.0.0"
ext_storage: ext_storage:
dependency: "direct main" dependency: "direct main"
description: description:
@ -263,19 +251,19 @@ packages:
source: hosted source: hosted
version: "1.0.0" version: "1.0.0"
file: file:
dependency: "direct overridden" dependency: transitive
description: description:
name: file name: file
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "6.0.0-nullsafety.2" version: "6.1.0"
file_picker: file_picker:
dependency: "direct main" dependency: "direct main"
description: description:
name: file_picker name: file_picker
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.7" version: "3.0.0"
filesystem_picker: filesystem_picker:
dependency: "direct main" dependency: "direct main"
description: description:
@ -296,66 +284,68 @@ packages:
name: firebase name: firebase
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "7.3.0" version: "9.0.1"
firebase_analytics: firebase_analytics:
dependency: "direct main" dependency: "direct main"
description: description:
name: firebase_analytics name: firebase_analytics
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "6.2.0" version: "7.1.1"
firebase_analytics_platform_interface: firebase_analytics_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: firebase_analytics_platform_interface name: firebase_analytics_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.3" version: "1.1.0"
firebase_analytics_web: firebase_analytics_web:
dependency: transitive dependency: transitive
description: description:
name: firebase_analytics_web name: firebase_analytics_web
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.1" version: "0.2.0+1"
firebase_core: firebase_core:
dependency: transitive dependency: transitive
description: description:
name: firebase_core name: firebase_core
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.5.2" version: "1.0.2"
firebase_core_platform_interface: firebase_core_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: firebase_core_platform_interface name: firebase_core_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.0" version: "4.0.0"
firebase_core_web: firebase_core_web:
dependency: transitive dependency: transitive
description: description:
name: firebase_core_web name: firebase_core_web
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.1" version: "1.0.2"
flutter: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
source: sdk source: sdk
version: "0.0.0" version: "0.0.0"
flutter_blurhash:
dependency: transitive
description:
name: flutter_blurhash
url: "https://pub.dartlang.org"
source: hosted
version: "0.5.0"
flutter_cache_manager: flutter_cache_manager:
dependency: "direct main" dependency: "direct main"
description: description:
name: flutter_cache_manager name: flutter_cache_manager
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.4.2" version: "2.1.2"
flutter_driver:
dependency: "direct dev"
description: flutter
source: sdk
version: "0.0.0"
flutter_email_sender: flutter_email_sender:
dependency: "direct main" dependency: "direct main"
description: description:
@ -376,7 +366,7 @@ packages:
name: flutter_launcher_icons name: flutter_launcher_icons
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.7.4" version: "0.9.0"
flutter_localizations: flutter_localizations:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
@ -388,14 +378,14 @@ packages:
name: flutter_markdown name: flutter_markdown
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.5.1" version: "0.6.1"
flutter_plugin_android_lifecycle: flutter_plugin_android_lifecycle:
dependency: "direct main" dependency: transitive
description: description:
name: flutter_plugin_android_lifecycle name: flutter_plugin_android_lifecycle
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.8" version: "2.0.0"
flutter_sentry: flutter_sentry:
dependency: "direct main" dependency: "direct main"
description: description:
@ -416,7 +406,7 @@ packages:
name: flutter_svg name: flutter_svg
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.19.1" version: "0.21.0-nullsafety.0"
flutter_test: flutter_test:
dependency: "direct dev" dependency: "direct dev"
description: flutter description: flutter
@ -448,11 +438,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.6.0" version: "0.6.0"
fuchsia_remote_debug_protocol:
dependency: transitive
description: flutter
source: sdk
version: "0.0.0"
function_types: function_types:
dependency: "direct main" dependency: "direct main"
description: description:
@ -489,30 +474,14 @@ packages:
name: google_fonts name: google_fonts
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.1" version: "2.0.0"
gotrue:
dependency: "direct main"
description:
path: "."
ref: HEAD
resolved-ref: "5fea2573f075cd307e8cf0c323487b4685f28a87"
url: "https://github.com/GitJournal/gotrue-dart.git"
source: git
version: "1.0.0"
html:
dependency: transitive
description:
name: html
url: "https://pub.dartlang.org"
source: hosted
version: "0.14.0+3"
http: http:
dependency: "direct main" dependency: "direct main"
description: description:
name: http name: http
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.12.1" version: "0.13.1"
http_multi_server: http_multi_server:
dependency: transitive dependency: transitive
description: description:
@ -526,7 +495,7 @@ packages:
name: http_parser name: http_parser
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.1.3" version: "4.0.0"
icloud_documents_path: icloud_documents_path:
dependency: "direct main" dependency: "direct main"
description: description:
@ -542,28 +511,35 @@ packages:
name: image name: image
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.12" version: "3.0.2"
image_picker: image_picker:
dependency: "direct main" dependency: "direct main"
description: description:
name: image_picker name: image_picker
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.6.7" version: "0.7.3"
image_picker_for_web:
dependency: transitive
description:
name: image_picker_for_web
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
image_picker_platform_interface: image_picker_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: image_picker_platform_interface name: image_picker_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0" version: "2.0.1"
import_sorter: import_sorter:
dependency: "direct dev" dependency: "direct dev"
description: description:
name: import_sorter name: import_sorter
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "4.2.2" version: "4.4.2"
in_app_purchase: in_app_purchase:
dependency: "direct main" dependency: "direct main"
description: description:
@ -621,14 +597,12 @@ packages:
source: hosted source: hosted
version: "0.11.3+2" version: "0.11.3+2"
markdown: markdown:
dependency: "direct overridden" dependency: transitive
description: description:
path: "." name: markdown
ref: HEAD url: "https://pub.dartlang.org"
resolved-ref: "2e87055c39b4b29939bb99ceff593880e2bcf20a" source: hosted
url: "https://github.com/GitJournal/markdown.git" version: "4.0.0"
source: git
version: "2.1.5"
matcher: matcher:
dependency: transitive dependency: transitive
description: description:
@ -649,7 +623,7 @@ packages:
name: mime name: mime
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.9.6+3" version: "1.0.0"
multicast_dns: multicast_dns:
dependency: "direct dev" dependency: "direct dev"
description: description:
@ -692,6 +666,13 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.4.8" version: "1.4.8"
octo_image:
dependency: transitive
description:
name: octo_image
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.0"
package_config: package_config:
dependency: transitive dependency: transitive
description: description:
@ -706,13 +687,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.4.1" version: "0.4.1"
package_resolver:
dependency: transitive
description:
name: package_resolver
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.10"
path: path:
dependency: "direct main" dependency: "direct main"
description: description:
@ -726,49 +700,49 @@ packages:
name: path_drawing name: path_drawing
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.4.1+1" version: "0.5.0-nullsafety.0"
path_parsing: path_parsing:
dependency: transitive dependency: transitive
description: description:
name: path_parsing name: path_parsing
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.4" version: "0.2.0-nullsafety.0"
path_provider: path_provider:
dependency: transitive dependency: transitive
description: description:
name: path_provider name: path_provider
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.6.5" version: "2.0.1"
path_provider_linux: path_provider_linux:
dependency: transitive dependency: transitive
description: description:
name: path_provider_linux name: path_provider_linux
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.1+2" version: "2.0.0"
path_provider_macos: path_provider_macos:
dependency: transitive dependency: transitive
description: description:
name: path_provider_macos name: path_provider_macos
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.4" version: "2.0.0"
path_provider_platform_interface: path_provider_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: path_provider_platform_interface name: path_provider_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.3" version: "2.0.1"
path_provider_windows: path_provider_windows:
dependency: transitive dependency: transitive
description: description:
name: path_provider_windows name: path_provider_windows
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.5" version: "2.0.0"
pedantic: pedantic:
dependency: transitive dependency: transitive
description: description:
@ -782,35 +756,35 @@ packages:
name: permission_handler name: permission_handler
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "5.1.0+2" version: "6.1.1"
permission_handler_platform_interface: permission_handler_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: permission_handler_platform_interface name: permission_handler_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.2" version: "3.1.1"
petitparser: petitparser:
dependency: transitive dependency: transitive
description: description:
name: petitparser name: petitparser
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.1.0" version: "4.0.2"
platform: platform:
dependency: "direct overridden" dependency: transitive
description: description:
name: platform name: platform
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.0.0-nullsafety.2" version: "3.0.0"
plugin_platform_interface: plugin_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: plugin_platform_interface name: plugin_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.2" version: "2.0.0"
pointycastle: pointycastle:
dependency: transitive dependency: transitive
description: description:
@ -826,12 +800,12 @@ packages:
source: hosted source: hosted
version: "1.5.0" version: "1.5.0"
process: process:
dependency: "direct overridden" dependency: transitive
description: description:
name: process name: process
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "4.0.0-nullsafety.2" version: "4.2.1"
provider: provider:
dependency: "direct main" dependency: "direct main"
description: description:
@ -839,13 +813,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "4.3.2+2" version: "4.3.2+2"
pub_cache:
dependency: transitive
description:
name: pub_cache
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.3"
pub_semver: pub_semver:
dependency: transitive dependency: transitive
description: description:
@ -866,7 +833,7 @@ packages:
name: quiver name: quiver
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.5" version: "3.0.0"
receive_sharing_intent: receive_sharing_intent:
dependency: "direct main" dependency: "direct main"
description: description:
@ -874,13 +841,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.4.0+2" version: "1.4.0+2"
resource:
dependency: transitive
description:
name: resource
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.7"
rxdart: rxdart:
dependency: transitive dependency: transitive
description: description:
@ -888,13 +848,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.24.0" version: "0.24.0"
screenshots:
dependency: "direct dev"
description:
name: screenshots
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.1"
sentry: sentry:
dependency: "direct main" dependency: "direct main"
description: description:
@ -915,70 +868,70 @@ packages:
name: shared_preferences name: shared_preferences
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.5.12+4" version: "2.0.5"
shared_preferences_linux: shared_preferences_linux:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_linux name: shared_preferences_linux
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.2+4" version: "2.0.0"
shared_preferences_macos: shared_preferences_macos:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_macos name: shared_preferences_macos
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.1+3" version: "2.0.0"
shared_preferences_platform_interface: shared_preferences_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_platform_interface name: shared_preferences_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.1" version: "2.0.0"
shared_preferences_web: shared_preferences_web:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_web name: shared_preferences_web
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.2+2" version: "2.0.0"
shared_preferences_windows: shared_preferences_windows:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_windows name: shared_preferences_windows
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.2+3" version: "2.0.0"
shelf: shelf:
dependency: transitive dependency: transitive
description: description:
name: shelf name: shelf
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.7.5" version: "1.1.0"
shelf_packages_handler: shelf_packages_handler:
dependency: transitive dependency: transitive
description: description:
name: shelf_packages_handler name: shelf_packages_handler
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.4" version: "3.0.0"
shelf_static: shelf_static:
dependency: transitive dependency: transitive
description: description:
name: shelf_static name: shelf_static
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.8" version: "1.0.0"
shelf_web_socket: shelf_web_socket:
dependency: transitive dependency: transitive
description: description:
name: shelf_web_socket name: shelf_web_socket
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.3" version: "1.0.1"
sky_engine: sky_engine:
dependency: transitive dependency: transitive
description: flutter description: flutter
@ -1011,21 +964,14 @@ packages:
name: sqflite name: sqflite
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.3.0" version: "1.3.2+1"
sqflite_common: sqflite_common:
dependency: transitive dependency: transitive
description: description:
name: sqflite_common name: sqflite_common
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.0+1" version: "1.0.2+1"
ssh_key:
dependency: "direct main"
description:
name: ssh_key
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.0"
stack_trace: stack_trace:
dependency: "direct main" dependency: "direct main"
description: description:
@ -1047,13 +993,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0" version: "1.1.0"
sync_http:
dependency: transitive
description:
name: sync_http
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.0"
synchronized: synchronized:
dependency: "direct main" dependency: "direct main"
description: description:
@ -1103,27 +1042,20 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.27" version: "2.0.27"
tool_base: tint:
dependency: transitive dependency: transitive
description: description:
name: tool_base name: tint
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.9.5+3" version: "2.0.0"
tool_mobile:
dependency: transitive
description:
name: tool_mobile
url: "https://pub.dartlang.org"
source: hosted
version: "1.9.5+1"
tuple: tuple:
dependency: transitive dependency: transitive
description: description:
name: tuple name: tuple
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.3" version: "2.0.0"
typed_data: typed_data:
dependency: transitive dependency: transitive
description: description:
@ -1137,42 +1069,56 @@ packages:
name: url_launcher name: url_launcher
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "5.4.1" version: "6.0.2"
url_launcher_linux:
dependency: transitive
description:
name: url_launcher_linux
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
url_launcher_macos: url_launcher_macos:
dependency: transitive dependency: transitive
description: description:
name: url_launcher_macos name: url_launcher_macos
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.1+2" version: "2.0.0"
url_launcher_platform_interface: url_launcher_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: url_launcher_platform_interface name: url_launcher_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.5" version: "2.0.2"
url_launcher_web: url_launcher_web:
dependency: transitive dependency: transitive
description: description:
name: url_launcher_web name: url_launcher_web
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.0+2" version: "2.0.0"
url_launcher_windows:
dependency: transitive
description:
name: url_launcher_windows
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
usage: usage:
dependency: transitive dependency: transitive
description: description:
name: usage name: usage
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.4.1" version: "3.4.2"
uuid: uuid:
dependency: "direct main" dependency: "direct main"
description: description:
name: uuid name: uuid
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.4" version: "3.0.2"
vector_math: vector_math:
dependency: transitive dependency: transitive
description: description:
@ -1200,14 +1146,7 @@ packages:
name: web_socket_channel name: web_socket_channel
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0" version: "2.0.0"
webdriver:
dependency: transitive
description:
name: webdriver
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.2"
webkit_inspection_protocol: webkit_inspection_protocol:
dependency: transitive dependency: transitive
description: description:
@ -1228,28 +1167,28 @@ packages:
name: xdg_directories name: xdg_directories
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.2" version: "0.2.0"
xml: xml:
dependency: "direct overridden" dependency: transitive
description: description:
name: xml name: xml
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "4.5.1" version: "5.0.2"
yaml: yaml:
dependency: "direct main" dependency: "direct main"
description: description:
name: yaml name: yaml
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.2.1" version: "3.1.0"
yaml_serializer: yaml_serializer:
dependency: "direct main" dependency: "direct main"
description: description:
name: yaml_serializer name: yaml_serializer
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.9" version: "0.0.10"
sdks: sdks:
dart: ">=2.12.0 <3.0.0" dart: ">=2.12.0 <3.0.0"
flutter: ">=1.20.0" flutter: ">=1.24.0-7.0"

53
pubspec.yaml
View File

@ -18,9 +18,6 @@ dependencies:
git_bindings: git_bindings:
#path: /Users/vishesh/src/gitjournal/git_bindings #path: /Users/vishesh/src/gitjournal/git_bindings
git: https://github.com/GitJournal/git_bindings.git git: https://github.com/GitJournal/git_bindings.git
gotrue:
#path: /Users/vishesh/src/gitjournal/gotrue-dart/
git: https://github.com/GitJournal/gotrue-dart.git
icloud_documents_path: icloud_documents_path:
git: https://github.com/GitJournal/icloud_documents_path.git git: https://github.com/GitJournal/icloud_documents_path.git
auto_size_text: ^2.0.1 auto_size_text: ^2.0.1
@ -32,29 +29,28 @@ dependencies:
crypton: ^1.1.3 crypton: ^1.1.3
device_info: ">=0.4.2+4 <2.0.0" device_info: ">=0.4.2+4 <2.0.0"
dots_indicator: ^0.0.3 dots_indicator: ^0.0.3
easy_localization: ^2.3.2 easy_localization: ^3.0.0
easy_localization_loader: ^0.0.2 easy_localization_loader: ^0.0.2
email_validator: ^1.0.6 email_validator: ^1.0.6
equatable: ^1.1.0 equatable: ^2.0.0
ext_storage: ^1.0.3 ext_storage: ^1.0.3
file_picker: ^2.0.7 file_picker: ^3.0.0
filesystem_picker: ^1.0.3 # for directories filesystem_picker: ^1.0.3 # for directories
fimber: ^0.3.0 fimber: ^0.3.0
firebase_analytics: ^6.2.0 firebase_analytics: ^7.1.1
flutter_cache_manager: ^1.4.2 flutter_cache_manager: ^2.1.2
flutter_email_sender: ^3.0.1 flutter_email_sender: ^3.0.1
flutter_emoji: ">= 2.0.0" flutter_emoji: ">= 2.0.0"
flutter_markdown: ^0.5.1 flutter_markdown: ^0.6.1
flutter_plugin_android_lifecycle: ^1.0.8 # for fixing the build
flutter_sentry: ^0.4.4 flutter_sentry: ^0.4.4
flutter_staggered_grid_view: ^0.3.0 flutter_staggered_grid_view: ^0.3.0
flutter_svg: ^0.19.0 flutter_svg: ^0.21.0-nullsafety.0
font_awesome_flutter: ^8.7.0 font_awesome_flutter: ^8.7.0
function_types: ^0.0.2 function_types: ^0.0.2
git_url_parse2: ^0.0.1 git_url_parse2: ^0.0.1
google_fonts: ^1.1.1 google_fonts: ^2.0.0
http: ^0.12.0+1 http: ^0.13.1
image_picker: ^0.6.7 image_picker: ^0.7.3
in_app_purchase: ^0.3.4+5 in_app_purchase: ^0.3.4+5
intl: ^0.17.0 intl: ^0.17.0
isolate: ^2.0.3 isolate: ^2.0.3
@ -62,45 +58,40 @@ dependencies:
mutex: ^1.0.3 mutex: ^1.0.3
package_info: ">=0.4.1 <2.0.0" package_info: ">=0.4.1 <2.0.0"
path: ^1.6.2 path: ^1.6.2
permission_handler: ^5.1.0+2 permission_handler: ^6.1.1
provider: ^4.3.2+2 provider: ^4.3.2+2
quick_actions: ^0.4.0+10 quick_actions: ^0.4.0+10
receive_sharing_intent: ^1.4.0+2 receive_sharing_intent: ^1.4.0+2
sentry: ">=3.0.0 <4.0.0" sentry: ">=3.0.0 <4.0.0"
share: ^0.6.3+5 share: ^0.6.3+5
shared_preferences: ^0.5.6 shared_preferences: ^2.0.5
ssh_key: ^0.6.0 #ssh_key: ^0.6.0
stack_trace: ^1.9.6 stack_trace: ^1.9.6
synchronized: ^2.2.0 synchronized: ^2.2.0
time: ^1.3.0 time: ^1.3.0
timeago: ^2.0.27 timeago: ^2.0.27
url_launcher: ^5.4.1 url_launcher: ^6.0.2
uuid: ^2.0.1 uuid: ^3.0.2
yaml: ^2.2.0 yaml: ^3.1.0
yaml_serializer: ^0.0.9 yaml_serializer: ^0.0.9
dev_dependencies: dev_dependencies:
flutter_driver: #flutter_driver:
sdk: flutter # sdk: flutter
flutter_test: flutter_test:
sdk: flutter sdk: flutter
benchmark_harness: any benchmark_harness: any
bonsoir: ^0.1.2+2 bonsoir: ^0.1.2+2
flutter_launcher_icons: "^0.7.2" flutter_launcher_icons: ^0.9.0
flutter_webview_plugin: ^0.3.11 flutter_webview_plugin: ^0.3.11
import_sorter: ^4.2.2 import_sorter: ^4.2.2
multicast_dns: ^0.2.2 multicast_dns: ^0.2.2
screenshots: ^2.1.1 #screenshots: ^2.1.1
test: ^1.5.1 test: ^1.5.1
dependency_overrides: dependency_overrides:
markdown: easy_localization_loader:
git: https://github.com/GitJournal/markdown.git git: https://github.com/aissat/easy_localization_loader
# Required for screenshots package
process: ^4.0.0-nullsafety.1
platform: ^3.0.0-nullsafety.1
file: ^6.0.0-nullsafety.1
xml: ^4.2.0
flutter: flutter:
uses-material-design: true uses-material-design: true

3
test_driver/main.dart
View File

@ -1,7 +1,6 @@
import 'dart:io'; import 'dart:io';
import 'package:dart_git/git.dart'; import 'package:dart_git/git.dart';
import 'package:flutter_driver/driver_extension.dart';
import 'package:meta/meta.dart'; import 'package:meta/meta.dart';
import 'package:path/path.dart' as p; import 'package:path/path.dart' as p;
import 'package:path_provider/path_provider.dart'; import 'package:path_provider/path_provider.dart';
@ -13,7 +12,7 @@ import 'package:gitjournal/app_settings.dart';
import 'package:gitjournal/utils/datetime.dart'; import 'package:gitjournal/utils/datetime.dart';
void main() async { void main() async {
enableFlutterDriverExtension(); // enableFlutterDriverExtension();
var pref = await SharedPreferences.getInstance(); var pref = await SharedPreferences.getInstance();
AppSettings.instance.load(pref); AppSettings.instance.load(pref);

5
test_driver/main_test.dart
View File

@ -1,5 +1,5 @@
import 'package:flutter_driver/flutter_driver.dart'; /*
import 'package:screenshots/screenshots.dart';
import 'package:test/test.dart'; import 'package:test/test.dart';
import 'package:time/time.dart'; import 'package:time/time.dart';
@ -233,3 +233,4 @@ void main() {
}, timeout: Timeout(20.minutes)); }, timeout: Timeout(20.minutes));
}); });
} }
*/