Skip to content

Commit

Permalink
Fixed failing build
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcinusX committed Aug 2, 2018
1 parent 7758a4b commit c531dba
Show file tree
Hide file tree
Showing 3 changed files with 87 additions and 19 deletions.
50 changes: 32 additions & 18 deletions android/app/build.gradle
Expand Up @@ -18,7 +18,12 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

def keystorePropertiesFile = rootProject.file("key.properties")
def keystoreProperties = new Properties()
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
if (keystorePropertiesFile.exists()) {
keystorePropertiesFile.withInputStream { stream ->
keystoreProperties.load(stream)
}
}
//keystoreProperties.load(new FileInputStream(keystorePropertiesFile))

android {
compileSdkVersion 27
Expand All @@ -33,33 +38,42 @@ android {
targetSdkVersion 27
versionCode 5
versionName "1.4"

applicationId "com.mszalek.weight_tracker"
}

signingConfigs {
release {
keyAlias keystoreProperties['keyAlias']
keyPassword keystoreProperties['keyPassword']
storeFile file(keystoreProperties['storeFile'])
storePassword keystoreProperties['storePassword']
if (keystorePropertiesFile.exists()) {
signingConfigs {
release {
keyAlias keystoreProperties['keyAlias']
keyPassword keystoreProperties['keyPassword']
storeFile file(keystoreProperties['storeFile'])
storePassword keystoreProperties['storePassword']
}

}
}
buildTypes {
release {
signingConfig signingConfigs.release
if (keystorePropertiesFile.exists()) {
signingConfig signingConfigs.release

} else {
signingConfig signingConfigs.debug
}
}
}
}

}

flutter {
source '../..'
}

dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
}
flutter {
source '../..'
}

dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
}

55 changes: 55 additions & 0 deletions android/app/google-services.json
@@ -0,0 +1,55 @@
{
"project_info": {
"project_number": "123595545975",
"firebase_url": "https://weight-tracker-e574f.firebaseio.com",
"project_id": "weight-tracker-e574f",
"storage_bucket": "weight-tracker-e574f.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:123595545975:android:94795a974b1f6481",
"android_client_info": {
"package_name": "com.mszalek.weight_tracker"
}
},
"oauth_client": [
{
"client_id": "123595545975-cv0hdhccs4o3itmi7k70o4d8i61injvi.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.mszalek.weight_tracker",
"certificate_hash": "4cfcaae693f041e62c51224b17ff5920ca45db7c"
}
},
{
"client_id": "123595545975-jvcpng9krrieeokh79673e448cekctnj.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyALrYc3bKgEoGPX2Ez3jjgejLRqaNXSysY"
}
],
"services": {
"analytics_service": {
"status": 1
},
"appinvite_service": {
"status": 2,
"other_platform_oauth_client": [
{
"client_id": "123595545975-jvcpng9krrieeokh79673e448cekctnj.apps.googleusercontent.com",
"client_type": 3
}
]
},
"ads_service": {
"status": 2
}
}
}
],
"configuration_version": "1"
}
1 change: 0 additions & 1 deletion pubspec.yaml
Expand Up @@ -25,7 +25,6 @@ flutter:
uses-material-design: true
assets:
- assets/scale-bathroom.png
- assets/user_icon.png

# To add assets from package dependencies, first ensure the asset
# is in the lib/ directory of the dependency. Then,
Expand Down

0 comments on commit c531dba

Please sign in to comment.