From 29d337acbf467c7d66d18314342965012233f475 Mon Sep 17 00:00:00 2001 From: yesimxev <3924854-yesimxev@users.noreply.gitlab.com> Date: Mon, 14 Aug 2023 09:43:41 +0000 Subject: [PATCH 1/8] Bump to 2023030100 for store --- build.gradle | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.gradle b/build.gradle index 79e7ea0..a47e408 100644 --- a/build.gradle +++ b/build.gradle @@ -8,6 +8,9 @@ buildscript { COMPILE_SDK_VERSION: 31, TARGET_SDK_VERSION : 32, JUNIT_VERSION : "4.12" + //version=YYYYMMVVRR (Either "VV" for stable version OR "RR" for pre-release candidate (e.g. 0001 for rc1)) + versionCode=2023030100 + versionName="2023.3" ] ext.deps = [ From 2e8ab256c2123188338009d9a86dc2277c5a0a66 Mon Sep 17 00:00:00 2001 From: yesimxev Date: Mon, 14 Aug 2023 16:49:09 +0100 Subject: [PATCH 2/8] Fixed version code placement --- build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a47e408..7f82be8 100644 --- a/build.gradle +++ b/build.gradle @@ -8,10 +8,13 @@ buildscript { COMPILE_SDK_VERSION: 31, TARGET_SDK_VERSION : 32, JUNIT_VERSION : "4.12" + ] + + ext { //version=YYYYMMVVRR (Either "VV" for stable version OR "RR" for pre-release candidate (e.g. 0001 for rc1)) versionCode=2023030100 versionName="2023.3" - ] + } ext.deps = [ "annotations" : "androidx.annotation:annotation:1.0.0", From 9629975c3ca5adb5ca15b11ac56724db4c59a064 Mon Sep 17 00:00:00 2001 From: yesimxev Date: Tue, 15 Aug 2023 19:24:54 +0100 Subject: [PATCH 3/8] Fixed version code placement #2 --- build.gradle | 6 ------ nhterm/build.gradle | 6 ++++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 7f82be8..79e7ea0 100644 --- a/build.gradle +++ b/build.gradle @@ -10,12 +10,6 @@ buildscript { JUNIT_VERSION : "4.12" ] - ext { - //version=YYYYMMVVRR (Either "VV" for stable version OR "RR" for pre-release candidate (e.g. 0001 for rc1)) - 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 d331904..00538a9 100644 --- a/nhterm/build.gradle +++ b/nhterm/build.gradle @@ -8,8 +8,10 @@ android { applicationId "com.offsec.nhterm" minSdkVersion rootProject.ext.android.MIN_SDK_VERSION targetSdkVersion rootProject.ext.android.TARGET_SDK_VERSION - versionCode 20232 - versionName "2023.2-dev" + //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" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' resConfigs 'zh-rCN', 'zh-rTW' externalNativeBuild { From 6cdc33aa3d3138b7074de8e99f98afab6551740c Mon Sep 17 00:00:00 2001 From: yesimxev Date: Wed, 16 Aug 2023 15:46:27 +0100 Subject: [PATCH 4/8] 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 @@ - + android:sharedUserId="com.offsec.nhterm" + package="com.offsec.nhterm"> From b09ecff08d61d5fae3166bb60c887a20654c2318 Mon Sep 17 00:00:00 2001 From: yesimxev Date: Wed, 16 Aug 2023 15:50:13 +0100 Subject: [PATCH 5/8] Fixed version code placement #4 --- build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 60379c1..7f82be8 100644 --- a/build.gradle +++ b/build.gradle @@ -11,8 +11,9 @@ buildscript { ] ext { - versionCode 2023030100 - versionName "2023.3" + //version=YYYYMMVVRR (Either "VV" for stable version OR "RR" for pre-release candidate (e.g. 0001 for rc1)) + versionCode=2023030100 + versionName="2023.3" } ext.deps = [ From 4ff98d5a146dbd8c4fc0422c33c7cb4454cbe117 Mon Sep 17 00:00:00 2001 From: yesimxev Date: Wed, 16 Aug 2023 21:38:46 +0100 Subject: [PATCH 6/8] Fixed version code placement #5 --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 7f82be8..34128c0 100644 --- a/build.gradle +++ b/build.gradle @@ -12,8 +12,8 @@ buildscript { ext { //version=YYYYMMVVRR (Either "VV" for stable version OR "RR" for pre-release candidate (e.g. 0001 for rc1)) - versionCode=2023030100 - versionName="2023.3" + versionCode 2023030100 + versionName "2023.3" } ext.deps = [ From 3fd1a675175c5b90ea6ab56d0064b087d2068101 Mon Sep 17 00:00:00 2001 From: yesimxev Date: Wed, 16 Aug 2023 21:42:12 +0100 Subject: [PATCH 7/8] Fixed version code placement #6 --- build.gradle | 6 ------ nhterm/build.gradle | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 34128c0..79e7ea0 100644 --- a/build.gradle +++ b/build.gradle @@ -10,12 +10,6 @@ buildscript { JUNIT_VERSION : "4.12" ] - ext { - //version=YYYYMMVVRR (Either "VV" for stable version OR "RR" for pre-release candidate (e.g. 0001 for rc1)) - 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 3bdde43..00538a9 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 rootProject.ext.versionCode - versionName rootProject.ext.versionName + versionCode 2023030100 + versionName "2023.3" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' resConfigs 'zh-rCN', 'zh-rTW' externalNativeBuild { From 823dddda904eddb0e558e876248ad3144af78585 Mon Sep 17 00:00:00 2001 From: yesimxev Date: Wed, 16 Aug 2023 22:16:41 +0100 Subject: [PATCH 8/8] Fixed version code placement #7 --- .gitlab-ci.yml | 6 +++--- build.gradle | 8 ++++++++ nhterm/build.gradle | 6 ++---- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a826757..4dd1422 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,8 +6,8 @@ stages: before_script: - export GRADLE_USER_HOME=$(pwd)/.gradle - export PACKAGE=`egrep '^[[:blank:]]+package' ./nhterm/src/main/AndroidManifest.xml | awk -F'[=>]' '{print $2}' | sed s/\"//g` -- export VERSION_NAME=`egrep '^[[:blank:]]+versionName[[:blank:]]' ./nhterm/build.gradle | awk '{print $2}' | sed s/\"//g` -- export VERSION_CODE=`egrep '^[[:blank:]]+versionCode[[:blank:]]' ./nhterm/build.gradle | awk '{print $2}' | sed s/\"//g` +- export VERSION_NAME=`egrep '^[[:blank:]]+versionName=' ./build.gradle | awk -F '"' '{print $2}'` +- export VERSION_CODE=`egrep '^[[:blank:]]+versionCode=' ./build.gradle | awk -F '=' '{print $2}'` - export APK_NAME="${PACKAGE}_${VERSION_CODE}" - chmod +x ./gradlew - echo $PACKAGE @@ -30,7 +30,7 @@ before_script: - mv ./nhterm/build/outputs/apk/debug/nhterm-debug.apk result/${APK_NAME}-debug.apk || mv ./nhterm/build/outputs/apk/debug/*-debug.apk result/${APK_NAME}-debug.apk - ls result/ - if [ -d /tmp/result ]; then cp result/* /tmp/result; fi # Copy it to host if run locally - + artifacts: name: "$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA-$CI_JOB_NAME" paths: diff --git a/build.gradle b/build.gradle index 79e7ea0..f8d99f8 100644 --- a/build.gradle +++ b/build.gradle @@ -10,6 +10,14 @@ buildscript { JUNIT_VERSION : "4.12" ] + + ext { + //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" + } + 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..639d467 100644 --- a/nhterm/build.gradle +++ b/nhterm/build.gradle @@ -8,10 +8,8 @@ android { applicationId "com.offsec.nhterm" minSdkVersion rootProject.ext.android.MIN_SDK_VERSION 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 {