Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions .idea/migrations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@

// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = "1.9.23"
ext.protoc_version = "3.19.3"
ext.protoc_version = "4.26.0"

repositories {
google()
Expand All @@ -11,7 +12,7 @@ buildscript {
}
}
dependencies {
classpath "com.android.tools.build:gradle:8.3.0"
classpath "com.android.tools.build:gradle:8.3.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath("org.jlleitschuh.gradle:ktlint-gradle:10.2.1")

Expand Down
11 changes: 6 additions & 5 deletions db/build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
plugins {
id 'com.android.library'
id 'kotlin-android'
id 'com.google.protobuf' version '0.8.15'
id 'com.google.protobuf' version '0.9.1'
}

android {
compileSdkVersion 33
namespace 'io.lantern.db'
compileSdkVersion 34
buildToolsVersion "30.0.3"

defaultConfig {
minSdkVersion 21
targetSdkVersion 33
targetSdkVersion 34
versionCode 1
versionName "1.0"

Expand Down Expand Up @@ -44,12 +45,12 @@ android {
}

dependencies {

coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'androidx.core:core-ktx:1.13.0'
implementation 'org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.5'

api group: 'net.zetetic', name: 'android-database-sqlcipher', version: '4.5.6'
api group: 'net.zetetic', name: 'android-database-sqlcipher', version: '4.5.4'
api "androidx.sqlite:sqlite-ktx:2.4.0"

implementation ('com.esotericsoftware:kryo:5.0.3') {
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion jitpack.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
jdk: openjdk11
jdk: openjdk17