Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adopt flutter version 0.3.1 #66

Closed
wants to merge 5 commits into from
Closed

Adopt flutter version 0.3.1 #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
14d4d09
Update cloud_firestore version to 0.2.9
gen0083 May 1, 2018
5d44ee2
Add mockito dependency as dev_dependencies
gen0083 May 1, 2018
ef9a95a
Change type from Null to dynamic
gen0083 May 1, 2018
7dcf8dc
Commented out around release key information as workaround
gen0083 May 1, 2018
3979e48
Fix type error
gen0083 May 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ if (flutterRoot == null) {
apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

def keystorePropertiesFile = rootProject.file("key.properties")
def keystoreProperties = new Properties()
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
//def keystorePropertiesFile = rootProject.file("key.properties")
//def keystoreProperties = new Properties()
//keystoreProperties.load(new FileInputStream(keystorePropertiesFile))

android {
compileSdkVersion 27
Expand All @@ -36,19 +36,19 @@ android {
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

signingConfigs {
release {
keyAlias keystoreProperties['keyAlias']
keyPassword keystoreProperties['keyPassword']
storeFile file(keystoreProperties['storeFile'])
storePassword keystoreProperties['storePassword']
}
}
// signingConfigs {
// release {
// keyAlias keystoreProperties['keyAlias']
// keyPassword keystoreProperties['keyPassword']
// storeFile file(keystoreProperties['storeFile'])
// storePassword keystoreProperties['storePassword']
// }
// }

buildTypes {
release {
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig signingConfigs.release
// signingConfig signingConfigs.release
}

profile {
Expand All @@ -67,4 +67,4 @@ dependencies {
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
}

apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.gms.google-services'
2 changes: 1 addition & 1 deletion lib/i18n/strings.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class Strings {
final String name =
locale.countryCode.isEmpty ? locale.languageCode : locale.toString();
final String localeName = Intl.canonicalizedLocale(name);
return initializeMessages(localeName).then((Null _) {
return initializeMessages(localeName).then((dynamic _) {
Intl.defaultLocale = localeName;
return new Strings();
});
Expand Down
2 changes: 1 addition & 1 deletion lib/models/session.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class Session {
var endsAt = DateTime.parse(json['endsAt']);
var isServiceSession = json['isServiceSession'];
var isPlenumSession = json['isPlenumSession'];
var speakers = [];
List<Speaker> speakers = [];
var room = roomMap[json['roomId']];

DurationType durationType;
Expand Down
4 changes: 2 additions & 2 deletions lib/models/speaker.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ class Speaker {
var isTopSpeaker = json['isTopSpeaker'];
var fullName = json['fullName'];

var sessions = [];
List<Session> sessions = [];
for (var sessionId in json['sessions']) {
sessions.add(sessionMap[sessionId]);
}

var links = [];
List<Link> links = [];
for (var link in json['links']) {
links.add(Link.fromJson(link));
}
Expand Down
7 changes: 4 additions & 3 deletions pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ dependencies:
uri: 0.7.0 # flutter_test depends on this version
url_launcher: "^2.0.1"

google_sign_in: 2.0.1
google_sign_in: 2.1.1
firebase_auth: 0.4.3
firebase_analytics: 0.2.2
cloud_firestore: 0.2.6
shared_preferences: 0.3.2
cloud_firestore: 0.2.9
shared_preferences: 0.3.3

# The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons.
Expand All @@ -27,6 +27,7 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
mockito: 2.2.3


# For information on the generic Dart part of this file, see the
Expand Down