Skip to content
Snippets Groups Projects
Commit ea4adbdc authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Merge branch '2-fix-build-application-package' into 'master'

Resolve "Fix build application package"

Closes #2

See merge request !2
parents 5b8fca20 78e4ed54
No related branches found
No related tags found
1 merge request!2Resolve "Fix build application package"
Pipeline #874 passed
...@@ -6,41 +6,61 @@ if (localPropertiesFile.exists()) { ...@@ -6,41 +6,61 @@ if (localPropertiesFile.exists()) {
} }
} }
def gradleProperties = new Properties()
def gradlePropertiesFile = rootProject.file('gradle.properties')
if (gradlePropertiesFile.exists()) {
gradlePropertiesFile.withReader('UTF-8') { reader ->
gradleProperties.load(reader)
}
}
def flutterRoot = localProperties.getProperty('flutter.sdk') def flutterRoot = localProperties.getProperty('flutter.sdk')
if (flutterRoot == null) { if (flutterRoot == null) {
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
} }
def flutterVersionCode = localProperties.getProperty('flutter.versionCode') def appVersionCode = gradleProperties.getProperty('app.versionCode')
if (flutterVersionCode == null) { if (appVersionCode == null) {
flutterVersionCode = '1' appVersionCode = '1'
} }
def flutterVersionName = localProperties.getProperty('flutter.versionName') def appVersionName = gradleProperties.getProperty('app.versionName')
if (flutterVersionName == null) { if (appVersionName == null) {
flutterVersionName = '1.0' appVersionName = '1.0'
} }
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
def keystoreProperties = new Properties()
def keystorePropertiesFile = rootProject.file('key.properties')
if (keystorePropertiesFile.exists()) {
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
}
android { android {
compileSdkVersion 30 compileSdkVersion 30
defaultConfig { defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "org.benoitharrault.random" applicationId "org.benoitharrault.random"
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 30 targetSdkVersion 30
versionCode flutterVersionCode.toInteger() versionCode appVersionCode.toInteger()
versionName flutterVersionName versionName appVersionName
archivesBaseName = "$applicationId" + "_" + "$versionCode"
} }
signingConfigs {
release {
keyAlias keystoreProperties['keyAlias']
keyPassword keystoreProperties['keyPassword']
storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
storePassword keystoreProperties['storePassword']
}
}
buildTypes { buildTypes {
release { release {
// TODO: Add your own signing config for the release build. signingConfig signingConfigs.release
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig signingConfigs.debug
} }
} }
} }
......
org.gradle.jvmargs=-Xmx1536M org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true android.useAndroidX=true
android.enableJetifier=true android.enableJetifier=true
app.versionName=1.0.0
app.versionCode=1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment