Skip to content
Snippets Groups Projects
Verified Commit 719b2d6b authored by Torsten Grote's avatar Torsten Grote
Browse files

Upgrade some dependencies to fix briar integration test

parent 715992cb
No related branches found
No related tags found
1 merge request!186Upgrade some dependencies to fix briar integration test
Pipeline #17090 failed
......@@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.android.tools.build:gradle:8.6.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
......
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1g
org.gradle.dependency.verification.console=verbose
# until we explicitly include do-not-kill-me-lib R class
android.nonTransitiveRClass=false
ext {
kotlin_version = '1.7.22' // 1.8.x has a jackson issue, test with JacksonProguardTest
hilt_version = '2.44.2'
kotlin_version = '1.9.10' // 1.8.x has a jackson issue, test with JacksonProguardTest
hilt_version = '2.48'
nav_version = '2.5.3'
tor_version = '0.4.8.9-1'
obfs4_version = '0.0.14-tor2'
......
This diff is collapsed.
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
distributionSha256Sum=e6d864e3b5bc05cc62041842b306383fc1fefcec359e70cebb1d470a6094ca82
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
distributionSha256Sum=2ab88d6de2c23e6adae7363ae6e29cbdd2a709e992929b48b6530fd0c7133bd6
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
......@@ -16,7 +16,7 @@ checkstyle {
android {
compileSdkVersion 33
buildToolsVersion "33.0.1"
buildToolsVersion "34.0.0"
namespace "org.briarproject.mailbox"
......@@ -52,12 +52,12 @@ android {
viewBinding true
}
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'
}
packagingOptions {
exclude 'META-INF/*'
......@@ -121,7 +121,7 @@ dependencies {
constraints {
// Work around duplicate class issues caused by dont-kill-me-lib, this project, and the
// IDEA plugin using different versions of Kotlin
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10'
}
}
......
......@@ -12,9 +12,6 @@ plugins {
id "org.jlleitschuh.gradle.ktlint" version "$ktlint_plugin_version"
}
sourceCompatibility = 1.8
targetCompatibility = 1.8
dependencies {
implementation project(path: ':mailbox-core', configuration: 'default')
implementation project(path: ':mailbox-lib', configuration: 'default')
......
......@@ -11,9 +11,6 @@ checkstyle {
configFile = new File('../config/checkstyle/checkstyle.xml')
}
sourceCompatibility = 1.8
targetCompatibility = 1.8
dependencies {
api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
api 'com.google.code.findbugs:jsr305:3.0.2'
......
......@@ -11,9 +11,6 @@ checkstyle {
configFile = new File('../config/checkstyle/checkstyle.xml')
}
sourceCompatibility = 1.8
targetCompatibility = 1.8
configurations {
tor
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment