Bump version to 2005

canyie · May 15, 2021 · e09e847 · e09e847
1 parent 99fb1c6
commit e09e847
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -17,10 +17,17 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
-                cFlags "-Wall -Wextra -Werror -fvisibility=hidden"
-                cppFlags "-std=c++17"
-                arguments "-DRIRU_NEW_MODULE_API_VERSION=$rootProject.ext.riruNewApiVersion",
-                    "-DRIRU_MODULE_VERSION_NAME=$rootProject.ext.versionName"
+                def flags = "-ffixed-x18" +
+                        " -fvisibility=hidden" +
+                        " -fvisibility-inlines-hidden" +
+                        " -fno-rtti" + " -fno-exceptions" +
+                        " -Wno-builtin-macro-redefined" +
+                        " -D__FILE__=__FILE_NAME__"
+                cFlags "-Wall -Wextra $flags"
+                cppFlags "-std=c++17 $flags"
+                arguments "-DRIRU_MODULE_VERSION_NAME=$rootProject.ext.versionName",
+                        "-DRIRU_NEW_MODULE_API_VERSION=$rootProject.ext.riruNewApiVersion",
+                        "-DDREAMLAND_VERSION_CODE=$rootProject.ext.versionCode"
             }
         }
         ndk {

diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.4.1)
 
 add_definitions(-DRIRU_NEW_MODULE_API_VERSION=${RIRU_NEW_MODULE_API_VERSION})
 add_definitions(-DRIRU_MODULE_VERSION_NAME="${RIRU_MODULE_VERSION_NAME}")
+add_definitions(-DDREAMLAND_VERSION_CODE=${DREAMLAND_VERSION_CODE})
 
 add_library(riru_dreamland
         SHARED

diff --git a/app/src/main/cpp/dreamland/dreamland.h b/app/src/main/cpp/dreamland/dreamland.h
@@ -14,9 +14,8 @@
 namespace dreamland {
     class Dreamland {
     public:
-        // TODO: Get these versions from gradle
-        static constexpr const char* VERSION_NAME = "2.0";
-        static constexpr int VERSION = 2004;
+        static constexpr const char* VERSION_NAME = RIRU_MODULE_VERSION_NAME;
+        static constexpr int VERSION = DREAMLAND_VERSION_CODE;
 
         static bool ShouldDisable();
 

diff --git a/app/src/main/cpp/main.cpp b/app/src/main/cpp/main.cpp
@@ -150,7 +150,7 @@ static auto module = RiruVersionedModuleInfo {
         .moduleInfo = RiruModuleInfo {
                 .supportHide = true,
                 .version = Dreamland::VERSION,
-                .versionName = RIRU_MODULE_VERSION_NAME,
+                .versionName = Dreamland::VERSION_NAME,
                 .onModuleLoaded = onModuleLoaded,
                 .shouldSkipUid = shouldSkipUid,
                 .forkAndSpecializePre = forkAndSpecializePre,

diff --git a/build.gradle b/build.gradle
@@ -36,7 +36,7 @@ ext {
     ndkVersion = "21.3.6528147"
     minSdkVersion = 24
     targetSdkVersion = 30 // useless for magisk module
-    versionCode = 2004
+    versionCode = 2005
     versionName = '2.0'
     minMagiskVersion = 19000
     riruApiVersion = 5 // For Riru v21