Hello Uvite!

Starting in our Android 14 based and after, there won't be more
numbering until stable builds.

Alpha, beta and unofficial builds will be differentiated by the
build date.

Stable builds will now be structured using the next scheme, X.Y.Z

X will be the major version, which will grow up every time we update the platform SPL.

Y will be based on the week the build is released, which will be incremental for every week after X has changed.

Z will be used for hotfixes, which will be incremented depending on how many updates the device get within the same week.

With this new scheme users will be able to follow the changelog for each version as it will be posted in our an specific section on the website, and also will help us showing a platform changelog in the new OTA app on each update.

And as always, it's time for the new wallpaper for Paranoid Android Uvite Alpha.

Change-Id: I0056444100f85d7a404896438719a15aa6b3ffeb
Co-authored-by: Fabian Leutenegger <fabian.leutenegger@bluewin.ch>
Signed-off-by: Hernán Castañón Álvarez <herna@paranoidandroid.co>

build.sh

@@ -36,7 +36,7 @@ function showHelpAndExit {
         echo -e "${CLR_BLD_BLU}  -c, --clean           Wipe the tree before building${CLR_RST}"
         echo -e "${CLR_BLD_BLU}  -i, --installclean    Dirty build - Use 'installclean'${CLR_RST}"
         echo -e "${CLR_BLD_BLU}  -r, --repo-sync       Sync before building${CLR_RST}"
-        echo -e "${CLR_BLD_BLU}  -v, --variant         AOSPA variant - Can be alpha, beta or release${CLR_RST}"
+        echo -e "${CLR_BLD_BLU}  -v, --variant         AOSPA variant - Can be alpha, beta or stable${CLR_RST}"
         echo -e "${CLR_BLD_BLU}  -t, --build-type      Specify build type${CLR_RST}"
         echo -e "${CLR_BLD_BLU}  -j, --jobs            Specify jobs/threads to use${CLR_RST}"
         echo -e "${CLR_BLD_BLU}  -m, --module          Build a specific module${CLR_RST}"
@@ -105,14 +105,14 @@ fi
 # Setup AOSPA variant if specified
 if [ $AOSPA_VARIANT ]; then
     AOSPA_VARIANT=`echo $AOSPA_VARIANT |  tr "[:upper:]" "[:lower:]"`
-    if [ "${AOSPA_VARIANT}" = "release" ]; then
-        export AOSPA_BUILDTYPE=RELEASE
+    if [ "${AOSPA_VARIANT}" = "stable" ]; then
+        export AOSPA_BUILDTYPE=STABLE
     elif [ "${AOSPA_VARIANT}" = "beta" ]; then
         export AOSPA_BUILDTYPE=BETA
     elif [ "${AOSPA_VARIANT}" = "alpha" ]; then
         export AOSPA_BUILDTYPE=ALPHA
     else
-        echo -e "${CLR_BLD_RED} Unknown AOSPA variant - use beta or release${CLR_RST}"
+        echo -e "${CLR_BLD_RED} Unknown AOSPA variant - use alpha, beta or stable${CLR_RST}"
         exit 1
     fi
 fi
@@ -120,7 +120,7 @@ fi
 # Setup AOSPA version if specified
 if [ $AOSPA_USER_VERSION ]; then
     # Check if it is a number
-    if [[ $AOSPA_USER_VERSION =~ ^[0-9]+(\.[0-9]+)?$ ]]; then
+    if [[ $AOSPA_USER_VERSION =~ ^[0-9]{1,3}(\.[0-9]{1,2})?(\.[0-9]{1,2})?$ ]]; then
         export AOSPA_BUILDVERSION=$AOSPA_USER_VERSION
     else
         echo -e "${CLR_BLD_RED}Invalid AOSPA version - use any non-negative number${CLR_RST}"
@@ -153,8 +153,6 @@ fi
 AOSPA_DISPLAY_VERSION="$(cat $DIR_ROOT/vendor/aospa/target/product/version.mk | grep 'AOSPA_MAJOR_VERSION := *' | sed 's/.*= //') "
 if [ $AOSPA_BUILDVERSION ]; then
     AOSPA_DISPLAY_VERSION+="$AOSPA_BUILDVERSION"
-else
-    AOSPA_DISPLAY_VERSION+="$(cat $DIR_ROOT/vendor/aospa/target/product/version.mk | grep 'AOSPA_MINOR_VERSION := *' | tail -n 1 | sed 's/.*= //')"
 fi
 
 # Prep for a clean build, if requested so

target/product/aospa-target.mk

@@ -149,7 +149,7 @@ PRODUCT_PACKAGES += \
     ParanoidThemePicker
 
 # Paranoid Hub (OTA)
-ifneq ($(filter RELEASE BETA,$(AOSPA_BUILDTYPE)),)
+ifneq ($(filter STABLE BETA,$(AOSPA_BUILDTYPE)),)
 PRODUCT_PACKAGES += ParanoidHub
 endif
 

target/product/version.mk

@@ -29,24 +29,24 @@ AOSPA_MAJOR_VERSION := uvite
 # The version code is the upgradable portion during the cycle of
 # every major Android release. Each version code upgrade indicates
 # our own major release during each lifecycle.
+# It is based in three parts
+# X for SPL changes, Y for week, and Z for hotfix.
 ifdef AOSPA_BUILDVERSION
     AOSPA_MINOR_VERSION := $(AOSPA_BUILDVERSION)
-else
-    AOSPA_MINOR_VERSION := 1
 endif
 
 # Build Variants
 #
 # Alpha: Development / Test releases
 # Beta: Public releases with CI
-# Release: Final Product | No Tagging
+# Stable: Final Product | No Tagging
 ifdef AOSPA_BUILDTYPE
   ifeq ($(AOSPA_BUILDTYPE), ALPHA)
       AOSPA_BUILD_VARIANT := alpha
   else ifeq ($(AOSPA_BUILDTYPE), BETA)
       AOSPA_BUILD_VARIANT := beta
-  else ifeq ($(AOSPA_BUILDTYPE), RELEASE)
-      AOSPA_BUILD_VARIANT := release
+  else ifeq ($(AOSPA_BUILDTYPE), STABLE)
+      AOSPA_BUILD_VARIANT := stable
   endif
 else
   AOSPA_BUILD_VARIANT := unofficial
@@ -56,21 +56,19 @@ endif
 BUILD_DATE := $(shell date -u +%Y%m%d)
 
 # AOSPA Version
-TMP_AOSPA_VERSION := $(AOSPA_MAJOR_VERSION)-
-ifeq ($(filter release,$(AOSPA_BUILD_VARIANT)),)
-    TMP_AOSPA_VERSION += $(AOSPA_BUILD_VARIANT)-
-endif
-ifeq ($(filter unofficial,$(AOSPA_BUILD_VARIANT)),)
-    TMP_AOSPA_VERSION += $(AOSPA_MINOR_VERSION)-
-endif
-TMP_AOSPA_VERSION += $(AOSPA_BUILD)-$(BUILD_DATE)
-AOSPA_VERSION := $(shell echo $(TMP_AOSPA_VERSION) | tr -d '[:space:]')
+AOSPA_VERSION := $(AOSPA_MAJOR_VERSION)-
+AOSPA_DISPLAY_VERSION := $(shell V1=$(AOSPA_MAJOR_VERSION); echo -n $${V1^})
 
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-    ro.aospa.version=$(AOSPA_VERSION)
+ifeq ($(filter stable,$(AOSPA_BUILD_VARIANT)),)
+    AOSPA_VERSION += $(AOSPA_BUILD_VARIANT)-
+    AOSPA_DISPLAY_VERSION += $(shell V1=$(AOSPA_BUILD_VARIANT); echo -n $${V1^})
+else
+    AOSPA_VERSION += $(AOSPA_MINOR_VERSION)-
+    AOSPA_DISPLAY_VERSION += $(AOSPA_MINOR_VERSION)
+endif
 
-# The properties will be uppercase for parse by Settings, etc.
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-    ro.aospa.version.major=$(shell V1=$(AOSPA_MAJOR_VERSION); echo $${V1^}) \
-    ro.aospa.version.minor=$(AOSPA_MINOR_VERSION) \
-    ro.aospa.build.variant=$(shell V2=$(AOSPA_BUILD_VARIANT); echo $${V2^})
+# Add BUILD_DATE for zip naming
+AOSPA_VERSION += $(AOSPA_BUILD)-$(BUILD_DATE)
+
+# Remove unwanted characters for zip naming
+AOSPA_VERSION := $(shell echo -n $(AOSPA_VERSION) | tr -d '[:space:]')