From 60c4e886d409ec8a0688e2fd43d8d12c06ebd8df Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Sun, 20 Jun 2021 22:01:07 +0200
Subject: [PATCH] Bump version to 1.18

Make the versionCode a decimal representation of the scrcpy version.

This will for example allow to correctly number the versionCode of
v1.17.1 after a v1.18 is released:
 - v1.18   -> 11800
 - v1.17.1 -> 11701
 - v1.18.1 -> 11801
---
 meson.build                    | 2 +-
 server/build.gradle            | 4 ++--
 server/build_without_gradle.sh | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index c2989ec7..2d76f1e9 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('scrcpy', 'c',
-        version: '1.17',
+        version: '1.18',
         meson_version: '>= 0.48',
         default_options: [
             'c_std=c11',
diff --git a/server/build.gradle b/server/build.gradle
index 08ce2d27..f088ba9d 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.genymobile.scrcpy"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 20
-        versionName "1.17"
+        versionCode 11800
+        versionName "1.18"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/server/build_without_gradle.sh b/server/build_without_gradle.sh
index 9afc5ba7..302d3aaa 100755
--- a/server/build_without_gradle.sh
+++ b/server/build_without_gradle.sh
@@ -12,7 +12,7 @@
 set -e
 
 SCRCPY_DEBUG=false
-SCRCPY_VERSION_NAME=1.17
+SCRCPY_VERSION_NAME=1.18
 
 PLATFORM=${ANDROID_PLATFORM:-30}
 BUILD_TOOLS=${ANDROID_BUILD_TOOLS:-30.0.0}