self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-01-26 18:58:21 +02:00
Code Issues Releases Activity

Merge branch 'release-2.0' into dev

Browse Source
This commit is contained in:
Laurent Cozic 2021-05-16 19:40:08 +02:00
commit a3f8cd4850
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/app-mobile/android/app/build.gradle
View File

@ -141,8 +141,8 @@ android {
applicationId "net.cozic.joplin" applicationId "net.cozic.joplin"
minSdkVersion rootProject.ext.minSdkVersion minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 2097631 versionCode 2097632
versionName "2.0.0" versionName "2.0.1"
ndk { ndk {
abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64" abiFilters "armeabi-v7a", "x86", "arm64-v8a", "x86_64"
} }

4
packages/tools/release-android.ts
View File

@ -1,5 +1,5 @@
import * as fs from 'fs-extra'; import * as fs from 'fs-extra';
import { execCommandVerbose, execCommandWithPipes, githubRelease, githubOauthToken, fileExists, completeReleaseWithChangelog } from './tool-utils'; import { execCommandVerbose, execCommandWithPipes, githubRelease, githubOauthToken, fileExists, gitPullTry, completeReleaseWithChangelog } from './tool-utils';
const path = require('path'); const path = require('path');
const fetch = require('node-fetch'); const fetch = require('node-fetch');
const uriTemplate = require('uri-template'); const uriTemplate = require('uri-template');
@ -147,6 +147,8 @@ async function main() {
if (!['release', 'prerelease'].includes(argv.type)) throw new Error('Must specify release type. Either --type=release or --type=prerelease'); if (!['release', 'prerelease'].includes(argv.type)) throw new Error('Must specify release type. Either --type=release or --type=prerelease');
await gitPullTry(false);
const isPreRelease = argv.type === 'prerelease'; const isPreRelease = argv.type === 'prerelease';
if (isPreRelease) console.info('Creating pre-release'); if (isPreRelease) console.info('Creating pre-release');