diff --git a/Jenkinsfile b/Jenkinsfile index c9b38f2..b0adeb7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -221,7 +221,7 @@ if ( env.DRYRUN != 'true' ) fastlane('android', 'alpha') sh(""" git checkout ${releaseFrom['remote']}/${releaseFrom['branch']} -git merge ${env.BRANCH_NAME} -m 'Merge changes from ${versionName}-${versionCode} back into ${releaseFrom['branch']}' +git merge releaseFrom['remote']/${env.BRANCH_NAME} -m 'Merge changes from ${currentVersion['versionName']}-${currentVersion['versionCode']} back into ${releaseFrom['branch']}' """) gitUpdateVersion(nextVersion.name, nextVersion.code) gitPush(releaseFrom['remote'], releaseFrom['branch']) @@ -251,7 +251,7 @@ def currentVersion = [ name: getVersion('versionName') as String, code: getVersion('versionCode') as Integer ] sh(""" git checkout ${releaseTo['remote']}/${releaseTo['branch']} -git merge ${env.BRANCH_NAME} -m 'Merge changes from ${versionName}-${versionCode} into ${releaseTo['branch']}' +git merge releaseFrom['remote']/${env.BRANCH_NAME} -m 'Merge changes from ${currentVersion['versionName']}-${currentVersion['versionCode']} into ${releaseTo['branch']}' """) gitPush(releaseTo['remote'], releaseTo['branch']) gitTag("${currentVersion.name}", releaseTo['remote']) diff --git a/app/build.gradle b/app/build.gradle index c92ffbc..ebbe6fb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,7 +36,7 @@ minSdkVersion 14 targetSdkVersion rootProject.ext.compileSdkVersion versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 32 - versionName project.hasProperty('versionName') ? project.property('versionName') : "0.0.2" + versionName project.hasProperty('versionName') ? project.property('versionName') : "0.0.3" multiDexEnabled true } dexOptions { diff --git a/fastlane/metadata/android/en-US/changelogs/32.txt b/fastlane/metadata/android/en-US/changelogs/32.txt new file mode 100644 index 0000000..cfe3c40 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/32.txt @@ -0,0 +1,2 @@ +- using updated build tools + diff --git a/fastlane/metadata/android/nl-NL/changelogs/32.txt b/fastlane/metadata/android/nl-NL/changelogs/32.txt new file mode 100644 index 0000000..29cb24a --- /dev/null +++ b/fastlane/metadata/android/nl-NL/changelogs/32.txt @@ -0,0 +1 @@ +- gebruik bijgewerkt bouwgereedschappen