From d99b2aa9d4a0a067e42c0650693387a22a72ef7c Mon Sep 17 00:00:00 2001
From: Jigar-f <jigar@getlantern.org>
Date: Wed, 24 Apr 2024 16:13:21 +0530
Subject: [PATCH 1/3] ddddc

dddd
---
 build.gradle                             |  5 +++--
 db/build.gradle                          | 11 ++++++-----
 gradle/wrapper/gradle-wrapper.properties |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5253b3b..85d7ca5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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()
@@ -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")
 
diff --git a/db/build.gradle b/db/build.gradle
index 65acccb..50e742f 100644
--- a/db/build.gradle
+++ b/db/build.gradle
@@ -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"
 
@@ -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') {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ffed3a2..29d2731 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -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
\ No newline at end of file

From 0c98d97c30a562ba96b79c542fc33384d86ac39e Mon Sep 17 00:00:00 2001
From: Jigar-f <jigar@getlantern.org>
Date: Wed, 24 Apr 2024 16:16:38 +0530
Subject: [PATCH 2/3] updated .idea files.

---
 .idea/compiler.xml   |  2 +-
 .idea/gradle.xml     |  5 ++---
 .idea/kotlinc.xml    |  2 +-
 .idea/migrations.xml | 10 ++++++++++
 .idea/misc.xml       |  2 +-
 5 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 .idea/migrations.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 8144c3c..3cd2840 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -11,6 +11,6 @@
       <entry name="!?*.kt" />
       <entry name="!?*.clj" />
     </wildcardResourcePatterns>
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 605119d..3768f1f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,16 +4,15 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/db" />
           </set>
         </option>
+        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 4515aa3..fe63bb6 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.6.10" />
+    <option name="version" value="1.9.23" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 0000000..f8051a6
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectMigrations">
+    <option name="MigrateToGradleLocalJavaHome">
+      <set>
+        <option value="$PROJECT_DIR$" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index fb7e159..55c0ec2 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="zulu-1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

From 5a082e0bddf028cd9ae89938a9403b7db8687639 Mon Sep 17 00:00:00 2001
From: Jigar-f <jigar@getlantern.org>
Date: Wed, 24 Apr 2024 16:27:23 +0530
Subject: [PATCH 3/3] Update jitpack.yml

---
 jitpack.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jitpack.yml b/jitpack.yml
index 88cfba7..bb8a4f6 100644
--- a/jitpack.yml
+++ b/jitpack.yml
@@ -1 +1 @@
-jdk: openjdk11
+jdk: openjdk17