From ca369d517359f3127e0c8586aab771996b4b75a8 Mon Sep 17 00:00:00 2001
From: Jigar-f <jigar@getlantern.org>
Date: Wed, 24 Apr 2024 16:56:51 +0530
Subject: [PATCH] Upgrade android-db and gradle version.

---
 build.gradle                                  |  6 +++---
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 jitpack.yml                                   |  2 +-
 messaging/build.gradle                        | 19 ++++++++++---------
 .../androidTest/assets/upside_down_test.mp4   |  3 ---
 messaging/src/main/AndroidManifest.xml        |  3 +--
 6 files changed, 16 insertions(+), 19 deletions(-)
 delete mode 100644 messaging/src/androidTest/assets/upside_down_test.mp4

diff --git a/build.gradle b/build.gradle
index 4bf8fd2..fcea7c3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.8.0"
-    ext.protoc_version = "3.19.3"
+    ext.kotlin_version = "1.9.23"
+    ext.protoc_version = "4.26.0"
 
     repositories {
         google()
@@ -12,7 +12,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "com.android.tools.build:gradle:7.1.3"
+        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/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ffed3a2..e411586 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
diff --git a/jitpack.yml b/jitpack.yml
index 88cfba7..bb8a4f6 100644
--- a/jitpack.yml
+++ b/jitpack.yml
@@ -1 +1 @@
-jdk: openjdk11
+jdk: openjdk17
diff --git a/messaging/build.gradle b/messaging/build.gradle
index 4252f97..9434597 100644
--- a/messaging/build.gradle
+++ b/messaging/build.gradle
@@ -1,16 +1,17 @@
 plugins {
     id 'com.android.library'
     id 'kotlin-android'
-    id 'com.google.protobuf' version '0.8.18'
+    id 'com.google.protobuf' version '0.9.1'
 }
 
 android {
-    compileSdkVersion 33
+    namespace 'io.lantern.messaging'
+    compileSdkVersion 34
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
@@ -26,12 +27,13 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+        coreLibraryDesugaringEnabled = true
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
     sourceSets {
@@ -59,8 +61,7 @@ android {
 }
 
 dependencies {
-
-//    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     implementation 'androidx.core:core-ktx:1.7.0'
@@ -77,7 +78,7 @@ dependencies {
     implementation 'com.j256.simplemagic:simplemagic:1.16'
 
 //    implementation 'com.github.getlantern:db-android:573aba1458'
-    implementation 'com.github.getlantern:db-android:36239c103c'
+    implementation 'com.github.getlantern:db-android:5a082e0bdd'
     implementation 'com.github.getlantern.curve25519-java:curve25519-java:cb0f93fdc1'
     implementation 'com.github.getlantern.libsignal-protocol-java:signal-protocol-java:e1bff03e8a'
     implementation 'com.github.getlantern:libsignal-metadata-java:b48974110a'
diff --git a/messaging/src/androidTest/assets/upside_down_test.mp4 b/messaging/src/androidTest/assets/upside_down_test.mp4
deleted file mode 100644
index 54079d5..0000000
--- a/messaging/src/androidTest/assets/upside_down_test.mp4
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b8e8acaa9690a0b2dfae6e3f040f5b56af7dd5c1b8543f17a091500bddc1f0c2
-size 3999937
diff --git a/messaging/src/main/AndroidManifest.xml b/messaging/src/main/AndroidManifest.xml
index c2c16fc..a880029 100644
--- a/messaging/src/main/AndroidManifest.xml
+++ b/messaging/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.lantern.messaging">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET" />
 </manifest>
\ No newline at end of file