Skip to content

Commit 738f10f

Browse files
committed
Import new trust level functionality part to main
2 parents fee9907 + 9cd97af commit 738f10f

73 files changed

Lines changed: 2391 additions & 9277 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

android/tinySSB/app/build.gradle

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,13 @@ android {
3030
}
3131
multiDexEnabled true
3232

33+
/*
3334
javaCompileOptions {
3435
annotationProcessorOptions {
35-
arguments += ["room.schemaLocation": "$projectDir/schemas".toString()]
36+
arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
3637
}
3738
}
39+
*/
3840
}
3941

4042
buildTypes {
@@ -59,6 +61,7 @@ android {
5961

6062
dependencies {
6163
api 'com.google.guava:guava:30.1.1-jre'
64+
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.9'
6265

6366
implementation fileTree(dir: "libs", include: ["*.jar"])
6467

@@ -68,10 +71,13 @@ dependencies {
6871

6972
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
7073
implementation 'androidx.core:core-ktx:1.6.0'
74+
implementation 'androidx.webkit:webkit:1.3.0'
75+
implementation "androidx.work:work-runtime-ktx:2.3.1"
7176

7277
// widgets
7378
implementation 'androidx.appcompat:appcompat:1.3.0'
7479
implementation 'com.google.android.material:material:1.4.0'
80+
implementation 'com.google.android.gms:play-services-location:18.0.0' // 21.3.0'
7581

7682
// websocket
7783
implementation 'com.squareup.okhttp3:okhttp:4.9.2'
@@ -85,9 +91,8 @@ dependencies {
8591
implementation 'net.java.dev.jna:jna:5.9.0@aar'
8692

8793
// database
88-
implementation "androidx.room:room-runtime:2.3.0"
89-
implementation 'com.google.android.gms:play-services-location:18.0.0' // 21.3.0'
90-
kapt "androidx.room:room-compiler:2.3.0"
94+
// implementation "androidx.room:room-runtime:2.3.0"
95+
// kapt "androidx.room:room-compiler:2.3.0"
9196
// implementation "androidx.room:room-rxjava2:2.3.0"
9297
// implementation "androidx.room:room-guava:2.3.0"
9398

Binary file not shown.

android/tinySSB/app/src/main/assets/web/games/dpi24-06-battleship/duel.css

Lines changed: 0 additions & 343 deletions
This file was deleted.

0 commit comments

Comments
 (0)