Merge branch 'develop'

This commit is contained in:
Thibault Deckers 2020-06-13 13:18:59 +09:00
commit a86480a62c
3 changed files with 3 additions and 2 deletions

View file

@ -47,6 +47,7 @@ android {
targetSdkVersion 29 // same as compileSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
manifestPlaceholders = [googleApiKey:keystoreProperties['googleApiKey']]
}
// compileOptions {

View file

@ -87,7 +87,7 @@
</provider>
<meta-data
android:name="com.google.android.geo.API_KEY"
android:value="AIzaSyDf-1dN6JivrQGKSmxAdxERLM2egOvzGWs" />
android:value="${googleApiKey}" />
<!-- Don't delete the meta-data below.
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
<meta-data

View file

@ -11,7 +11,7 @@ description: A new Flutter application.
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.0.1+2
version: 1.0.2+3
# video_player (as of v0.10.8+2, backed by ExoPlayer):
# - does not support content URIs (by default, but trivial by fork)