diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index 18ba9798..e35db420 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -10,12 +10,12 @@ set(CMAKE_CXX_STANDARD 17)
 include_directories(.)
 
 ### ICU4C ###
-include_directories(../icu4c/prebuilt/include)
-set(JNI_LIBS ${CMAKE_SOURCE_DIR}/../icu4c/prebuilt/jniLibs/${ANDROID_ABI})
-add_library(ICU::data STATIC IMPORTED)
-set_property(TARGET ICU::data PROPERTY IMPORTED_LOCATION "${JNI_LIBS}/libicudata.a")
-add_library(ICU::uc STATIC IMPORTED)
-set_property(TARGET ICU::uc PROPERTY IMPORTED_LOCATION "${JNI_LIBS}/libicuuc.a")
+#include_directories(../icu4c/prebuilt/include)
+#set(JNI_LIBS ${CMAKE_SOURCE_DIR}/../icu4c/prebuilt/jniLibs/${ANDROID_ABI})
+#add_library(ICU::data STATIC IMPORTED)
+#set_property(TARGET ICU::data PROPERTY IMPORTED_LOCATION "${JNI_LIBS}/libicudata.a")
+#add_library(ICU::uc STATIC IMPORTED)
+#set_property(TARGET ICU::uc PROPERTY IMPORTED_LOCATION "${JNI_LIBS}/libicuuc.a")
 
 ### FlorisBoard ###
 add_subdirectory(utils)
@@ -34,7 +34,7 @@ target_link_libraries(
         # Sources
         android
         log
-        ICU::uc
-        ICU::data
+        #ICU::uc
+        #ICU::data
         utils
 )
diff --git a/app/src/main/cpp/dev_patrickgold_florisboard_FlorisApplication.cpp b/app/src/main/cpp/dev_patrickgold_florisboard_FlorisApplication.cpp
index 5231ccfc..1d895249 100644
--- a/app/src/main/cpp/dev_patrickgold_florisboard_FlorisApplication.cpp
+++ b/app/src/main/cpp/dev_patrickgold_florisboard_FlorisApplication.cpp
@@ -17,7 +17,7 @@
 #include <fstream>
 #include <vector>
 #include <jni.h>
-#include <unicode/udata.h>
+//#include <unicode/udata.h>
 #include "utils/jni_utils.h"
 
 #pragma ide diagnostic ignored "UnusedLocalVariable"
@@ -27,7 +27,7 @@ JNIEXPORT jint JNICALL
 Java_dev_patrickgold_florisboard_FlorisApplication_00024Companion_nativeInitICUData(
         JNIEnv *env, jobject thiz, jobject path)
 {
-    auto path_str = utils::j2std_string(env, path);
+    /*auto path_str = utils::j2std_string(env, path);
     std::ifstream in_file(path_str, std::ios::in | std::ios::binary);
     if (!in_file) {
         return U_FILE_ACCESS_ERROR;
@@ -49,5 +49,6 @@ Java_dev_patrickgold_florisboard_FlorisApplication_00024Companion_nativeInitICUD
     in_file.close();
     UErrorCode status = U_ZERO_ERROR;
     udata_setCommonData(reinterpret_cast<void *>(icu_data), &status);
-    return status;
+    return status;*/
+    return 0;
 }
diff --git a/gradle.properties b/gradle.properties
index dc1be28e..8e1d667a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,7 @@
 # Use AndroidX package structure - https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0704ab20..33e9509b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 # Main
 accompanist = "0.25.0"
-android-gradle-plugin = "7.2.1"
+android-gradle-plugin = "8.0.0"
 androidx-activity = "1.5.1"
 androidx-autofill = "1.1.0"
 androidx-collection = "1.2.0"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5c51a4ac..f97ab1f0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=29e49b10984e585d8118b7d0bc452f944e386458df27371b49b4ac1dec4b7fda
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionSha256Sum=4159b938ec734a8388ce03f52aa8f3c7ed0d31f5438622545de4f83a89b79788
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists