From 88455ed03d090f8713f7a6ef8862486f4d2bca1d Mon Sep 17 00:00:00 2001
From: Greg Alexander <gitgreg@galexander.org>
Date: Tue, 29 Dec 2020 00:18:29 -0500
Subject: [PATCH] Move versionCode/versionName into build.gradle (instead of
 AndroidManifest), because that's apparently how it should be done these days.

---
 app/build.gradle                 | 3 +++
 app/src/main/AndroidManifest.xml | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 26c2824..60f27a3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,6 +26,9 @@ android {
         applicationId "org.galexander.sshd"
         minSdkVersion 17
         targetSdkVersion 30
+
+        versionCode 24
+        versionName "24"
     }
 
     buildTypes {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 03f47e7..4d7c836 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.galexander.sshd"
-      android:versionCode="24"
-      android:versionName="24">
+      package="org.galexander.sshd">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />