From 4098a4fe5dde5cdbdb9239c5b5b52e38580b6340 Mon Sep 17 00:00:00 2001
From: ialokim <ialokim@mailbox.org>
Date: Thu, 11 Nov 2021 16:13:43 +0100
Subject: [PATCH] update and clean up dependencies
---
build.gradle.kts | 14 +++++++-------
settings.gradle.kts | 1 -
.../briarproject/briar/desktop/DesktopModule.kt | 5 -----
.../briar/desktop/DesktopTestModule.kt | 5 -----
4 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/build.gradle.kts b/build.gradle.kts
index db99410ace..8c29b9ea7e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,6 @@
import org.jetbrains.compose.compose
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+import org.jetbrains.compose.jetbrainsCompose
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
buildscript {
@@ -26,9 +27,9 @@ buildscript {
}
plugins {
- kotlin("jvm") version "1.5.21"
- kotlin("kapt") version "1.5.21"
- id("org.jetbrains.compose") version "1.0.0-alpha3"
+ kotlin("jvm") version "1.5.31"
+ kotlin("kapt") version "1.5.31"
+ id("org.jetbrains.compose") version "1.0.0-beta5"
id("java")
id("idea")
id("org.jlleitschuh.gradle.ktlint") version "10.1.0"
@@ -40,7 +41,7 @@ version = "0.1"
allprojects {
repositories {
mavenCentral()
- maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+ jetbrainsCompose()
google()
jcenter()
}
@@ -48,10 +49,9 @@ allprojects {
dependencies {
implementation(compose.desktop.currentOs)
+ implementation(compose.materialIconsExtended)
- implementation("com.fasterxml.jackson.core:jackson-databind:2.10.0")
- implementation("com.github.ajalt:clikt:2.2.0")
- implementation("org.jetbrains.compose.material:material-icons-extended:0.4.0")
+ implementation("com.github.ajalt.clikt:clikt:3.3.0")
implementation("com.ibm.icu:icu4j:70.1")
implementation(project(path = ":briar-core", configuration = "default"))
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4acdb94410..28c2bd65a5 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,7 +1,6 @@
pluginManagement {
repositories {
gradlePluginPortal()
- maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
}
}
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt b/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
index 5d6a320667..f73704ab01 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/DesktopModule.kt
@@ -1,6 +1,5 @@
package org.briarproject.briar.desktop
-import com.fasterxml.jackson.databind.ObjectMapper
import dagger.Module
import dagger.Provides
import org.briarproject.bramble.account.AccountModule
@@ -96,10 +95,6 @@ internal class DesktopModule(
}
}
- @Provides
- @Singleton
- internal fun provideObjectMapper() = ObjectMapper()
-
@Provides
internal fun provideFeatureFlags() = object : FeatureFlags {
override fun shouldEnableImageAttachments() = false
diff --git a/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt b/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt
index d555e054aa..7bc4eff5f6 100644
--- a/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt
+++ b/src/test/kotlin/org/briarproject/briar/desktop/DesktopTestModule.kt
@@ -1,6 +1,5 @@
package org.briarproject.briar.desktop
-import com.fasterxml.jackson.databind.ObjectMapper
import dagger.Module
import dagger.Provides
import org.briarproject.bramble.account.AccountModule
@@ -101,10 +100,6 @@ internal class DesktopTestModule(
}
}
- @Provides
- @Singleton
- internal fun provideObjectMapper() = ObjectMapper()
-
@Provides
internal fun provideFeatureFlags() = object : FeatureFlags {
override fun shouldEnableImageAttachments() = false
--
GitLab