mirror/florisboard
0
0
Fork 0
mirror of https://github.com/florisboard/florisboard.git synced 2024-09-19 19:42:20 +02:00
Code

Upgrade Gradle to 8.0 and AGP to 8.0.0

Browse Source
This commit is contained in:
Patrick Goldinger 2023-04-22 14:32:22 +02:00
parent b9f9437fa7
commit a74e1fa489
No known key found for this signature in database
GPG Key ID: 533467C3DC7B9262
5 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/cpp/CMakeLists.txt
View File

@ -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
)

7
app/src/main/cpp/dev_patrickgold_florisboard_FlorisApplication.cpp
View File

@ -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;
}

3
gradle.properties
View File

@ -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

2
gradle/libs.versions.toml
View File

@ -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"

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -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