From 45f9db8ac426434b33c05a11d70277c0ee96f880 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Mon, 2 Oct 2023 14:20:17 +0100 Subject: [PATCH] Revert "waffle: Bump post-release version to 1.8.90" This reverts commit 651bd641fc51bcb21da837701ac81717971a4497. Was never meant to land in this branch - seems like we had a bug in the release script. Signed-off-by: Emil Velikov --- Android.mk | 2 +- cmake/Modules/WaffleDefineVersion.cmake | 2 +- meson.build | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Android.mk b/Android.mk index 7087cd6..4e34857 100644 --- a/Android.mk +++ b/Android.mk @@ -8,7 +8,7 @@ waffle_top := $(LOCAL_PATH) # waffle_major_version := 1 waffle_minor_version := 8 -waffle_patch_version := 90 +waffle_patch_version := 0 waffle_api_version := 0x0108 waffle_android_major_version := $(word 1, $(subst ., , $(PLATFORM_VERSION))) diff --git a/cmake/Modules/WaffleDefineVersion.cmake b/cmake/Modules/WaffleDefineVersion.cmake index d75d019..a93bec7 100644 --- a/cmake/Modules/WaffleDefineVersion.cmake +++ b/cmake/Modules/WaffleDefineVersion.cmake @@ -40,7 +40,7 @@ # set(waffle_major_version "1") set(waffle_minor_version "8") -set(waffle_patch_version "90") +set(waffle_patch_version "0") set(waffle_version "${waffle_major_version}.${waffle_minor_version}.${waffle_patch_version}") diff --git a/meson.build b/meson.build index 4d6e02f..fd69e64 100644 --- a/meson.build +++ b/meson.build @@ -28,7 +28,7 @@ project( 'waffle', ['c'], - version : '1.8.90', + version : '1.8.0', license : 'BSD2', meson_version : '>= 0.53', # ubproject cmocka throws a Wclobbered ... make this a level=2 once it's fixed -- 2.11.4.GIT