From 6cdc33aa3d3138b7074de8e99f98afab6551740c Mon Sep 17 00:00:00 2001
From: yesimxev <yesimxev@github.com>
Date: Wed, 16 Aug 2023 15:46:27 +0100
Subject: [PATCH] Fixed version code placement #3

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

diff --git a/build.gradle b/build.gradle
index 79e7ea0..60379c1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,6 +10,11 @@ buildscript {
     JUNIT_VERSION      : "4.12"
   ]
 
+  ext {
+    versionCode 2023030100
+    versionName "2023.3"
+  }
+
   ext.deps = [
     "annotations"         : "androidx.annotation:annotation:1.0.0",
     "appcompat-v7"        : "androidx.appcompat:appcompat:1.0.0",
diff --git a/nhterm/build.gradle b/nhterm/build.gradle
index 00538a9..3bdde43 100644
--- a/nhterm/build.gradle
+++ b/nhterm/build.gradle
@@ -10,8 +10,8 @@ android {
     targetSdkVersion rootProject.ext.android.TARGET_SDK_VERSION
     //version=YYYYMMVVRR (Either "VV" for stable version OR "RR" for pre-release candidate (e.g. 0001 for rc1))
     //noinspection HighAppVersionCode
-    versionCode 2023030100
-    versionName "2023.3"
+    versionCode rootProject.ext.versionCode
+    versionName rootProject.ext.versionName
     testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     resConfigs 'zh-rCN', 'zh-rTW'
     externalNativeBuild {
diff --git a/nhterm/src/main/AndroidManifest.xml b/nhterm/src/main/AndroidManifest.xml
index 281768b..9c50890 100644
--- a/nhterm/src/main/AndroidManifest.xml
+++ b/nhterm/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
-          android:sharedUserId="com.offsec.nhterm">
-
+          android:sharedUserId="com.offsec.nhterm"
+          package="com.offsec.nhterm">
   <uses-feature
     android:name="android.hardware.touchscreen"
     android:required="false"/>