diff --git a/Jenkinsfile b/Jenkinsfile index 2b341b4..656b9c3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -135,7 +135,7 @@ def currentVersion = androidVersion() echo("currentVersion = ${currentVersion.toString()}") if ( env.DRYRUN != 'true' ) fastlane('android', 'alpha') - lazyGitPassword('bot-ci-dgm', { + lazyGitPass('bot-ci-dgm', { gitMerge( "${env.BRANCH_NAME}", "${releaseFrom['branch']}", diff --git a/app/build.gradle b/app/build.gradle index 62e4721..ea3df7c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,7 +35,7 @@ applicationId "nl.digital_me.dummyandroidapp" minSdkVersion 14 targetSdkVersion rootProject.ext.compileSdkVersion - versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 42 + versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 43 versionName project.hasProperty('versionName') ? project.property('versionName') : "0.0.5" multiDexEnabled true } diff --git a/fastlane/metadata/android/en-US/changelogs/43.txt b/fastlane/metadata/android/en-US/changelogs/43.txt new file mode 100644 index 0000000..cfe3c40 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/43.txt @@ -0,0 +1,2 @@ +- using updated build tools + diff --git a/fastlane/metadata/android/nl-NL/changelogs/43.txt b/fastlane/metadata/android/nl-NL/changelogs/43.txt new file mode 100644 index 0000000..29cb24a --- /dev/null +++ b/fastlane/metadata/android/nl-NL/changelogs/43.txt @@ -0,0 +1 @@ +- gebruik bijgewerkt bouwgereedschappen