From 44f2842820fc42d33a904e243b1b1537cb281e6d Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Fri, 4 Sep 2020 17:28:18 +0100 Subject: [PATCH] Android release v1.0.339-3 --- ReactNativeClient/android/app/build.gradle | 4 ++-- ReactNativeClient/root.js | 2 +- Tools/release-android.js | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ReactNativeClient/android/app/build.gradle b/ReactNativeClient/android/app/build.gradle index 4da327e36c..6f210d0218 100644 --- a/ReactNativeClient/android/app/build.gradle +++ b/ReactNativeClient/android/app/build.gradle @@ -125,8 +125,8 @@ android { applicationId "net.cozic.joplin" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 2097574 - versionName "1.0.338" + versionCode 2097575 + versionName "1.0.339" ndk { abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64" } diff --git a/ReactNativeClient/root.js b/ReactNativeClient/root.js index 6b65553931..3ebccdbfe1 100644 --- a/ReactNativeClient/root.js +++ b/ReactNativeClient/root.js @@ -452,7 +452,7 @@ async function initialize(dispatch, messageHandler) { if (Setting.value('env') == 'prod') { await db.open({ name: 'joplin.sqlite' }); } else { - await db.open({ name: 'joplin-71.sqlite' }); + await db.open({ name: 'joplin-76.sqlite' }); // await db.clearForTesting(); } diff --git a/Tools/release-android.js b/Tools/release-android.js index 85abb3b715..b5b6a1698f 100644 --- a/Tools/release-android.js +++ b/Tools/release-android.js @@ -184,8 +184,10 @@ async function main() { console.info(`Creating GitHub release ${tagName}...`); + const releaseOptions = { isPreRelease: !!rcSuffix }; + const oauthToken = await githubOauthToken(); - const release = await githubRelease(projectName, tagName); + const release = await githubRelease(projectName, tagName, releaseOptions); const uploadUrlTemplate = uriTemplate.parse(release.upload_url); for (const releaseFilename in releaseFiles) {