Skip to content

Upgrade android-db and gradle version. #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jigar-f wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade android-db and gradle version. #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
Expand All @@ -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")

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion jitpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
jdk: openjdk11
jdk: openjdk17
19 changes: 10 additions & 9 deletions messaging/build.gradle
View file
Open in desktop
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.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
Expand All @@ -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 {
Expand Down Expand Up @@ -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'
Expand All @@ -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'
Expand Down
3 changes: 0 additions & 3 deletions messaging/src/androidTest/assets/upside_down_test.mp4
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions messaging/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>