diff --git a/app/build.gradle b/app/build.gradle index 2ca6aa7..4ae6a0d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,22 +7,12 @@ android { namespace 'org.hydev.wearsync' compileSdk 33 - sourceSets { - main { - jniLibs.srcDirs = ['libs'] - } - } - defaultConfig { applicationId "org.hydev.wearsync" minSdk 26 targetSdk 33 versionCode 1 versionName "1.0" - ndk { - abiFilters "aarch64", "armeabi", "arm64", "x86", "x86_64" - } - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -67,17 +57,6 @@ dependencies { // Database library implementation "com.influxdb:influxdb-client-kotlin:6.3.0" - implementation "org.jetbrains.exposed:exposed-core:0.40.1" - implementation "org.jetbrains.exposed:exposed-dao:0.40.1" - implementation "org.jetbrains.exposed:exposed-jdbc:0.40.1" - - // !IMPORTANT! Make sure to update native so when updating sqlite-jdbc - // Copy from sqlite-jdbc-3.40.0.0.jar!/org/sqlite/native/Linux-Android to app/libs - // ln -s arm armeabi - // ln -s arm armeabi-v7a - // ln -s aarch64 arm64 - // ln -s aarch64 arm64-v8a - implementation 'org.xerial:sqlite-jdbc:3.40.0.0' // Root library implementation "com.github.topjohnwu.libsu:core:5.0.4" diff --git a/app/libs/aarch64/libsqlitejdbc.so b/app/libs/aarch64/libsqlitejdbc.so deleted file mode 100644 index 3428671..0000000 Binary files a/app/libs/aarch64/libsqlitejdbc.so and /dev/null differ diff --git a/app/libs/arm/libsqlitejdbc.so b/app/libs/arm/libsqlitejdbc.so deleted file mode 100644 index 4fd6834..0000000 Binary files a/app/libs/arm/libsqlitejdbc.so and /dev/null differ diff --git a/app/libs/arm64 b/app/libs/arm64 deleted file mode 120000 index ec41841..0000000 --- a/app/libs/arm64 +++ /dev/null @@ -1 +0,0 @@ -aarch64 \ No newline at end of file diff --git a/app/libs/arm64-v8a b/app/libs/arm64-v8a deleted file mode 120000 index ec41841..0000000 --- a/app/libs/arm64-v8a +++ /dev/null @@ -1 +0,0 @@ -aarch64 \ No newline at end of file diff --git a/app/libs/armeabi b/app/libs/armeabi deleted file mode 120000 index 78504ba..0000000 --- a/app/libs/armeabi +++ /dev/null @@ -1 +0,0 @@ -arm \ No newline at end of file diff --git a/app/libs/armeabi-v7a b/app/libs/armeabi-v7a deleted file mode 120000 index 78504ba..0000000 --- a/app/libs/armeabi-v7a +++ /dev/null @@ -1 +0,0 @@ -arm \ No newline at end of file diff --git a/app/libs/x86/libsqlitejdbc.so b/app/libs/x86/libsqlitejdbc.so deleted file mode 100644 index 2d3f379..0000000 Binary files a/app/libs/x86/libsqlitejdbc.so and /dev/null differ diff --git a/app/libs/x86_64/libsqlitejdbc.so b/app/libs/x86_64/libsqlitejdbc.so deleted file mode 100644 index 04b7e95..0000000 Binary files a/app/libs/x86_64/libsqlitejdbc.so and /dev/null differ diff --git a/app/src/main/java/org/hydev/wearsync/mi/MiFitnessModels.kt b/app/src/main/java/org/hydev/wearsync/mi/MiFitnessModels.kt index 88d3555..7c529f0 100644 --- a/app/src/main/java/org/hydev/wearsync/mi/MiFitnessModels.kt +++ b/app/src/main/java/org/hydev/wearsync/mi/MiFitnessModels.kt @@ -16,14 +16,6 @@ import org.jetbrains.exposed.sql.* import java.time.Instant import java.util.* -object SleepSegment : Table("sleep_segment") { - val key = text("key") - val sid = text("sid") - val time = integer("time") - val isComplete = integer("isComplete") - val value = text("value") -} - @Measurement(name = "mi-sleep-day") class SleepNight : SleepDaytime() {