Skip to content
Snippets Groups Projects
Verified Commit 4098a4fe authored by Mikolai Gütschow's avatar Mikolai Gütschow
Browse files

update and clean up dependencies

parent ef03b9a6
No related branches found
No related tags found
1 merge request!41Update and clean up dependencies
Pipeline #8127 passed
import org.jetbrains.compose.compose import org.jetbrains.compose.compose
import org.jetbrains.compose.desktop.application.dsl.TargetFormat import org.jetbrains.compose.desktop.application.dsl.TargetFormat
import org.jetbrains.compose.jetbrainsCompose
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
buildscript { buildscript {
...@@ -26,9 +27,9 @@ buildscript { ...@@ -26,9 +27,9 @@ buildscript {
} }
plugins { plugins {
kotlin("jvm") version "1.5.21" kotlin("jvm") version "1.5.31"
kotlin("kapt") version "1.5.21" kotlin("kapt") version "1.5.31"
id("org.jetbrains.compose") version "1.0.0-alpha3" id("org.jetbrains.compose") version "1.0.0-beta5"
id("java") id("java")
id("idea") id("idea")
id("org.jlleitschuh.gradle.ktlint") version "10.1.0" id("org.jlleitschuh.gradle.ktlint") version "10.1.0"
...@@ -40,7 +41,7 @@ version = "0.1" ...@@ -40,7 +41,7 @@ version = "0.1"
allprojects { allprojects {
repositories { repositories {
mavenCentral() mavenCentral()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") jetbrainsCompose()
google() google()
jcenter() jcenter()
} }
...@@ -48,10 +49,9 @@ allprojects { ...@@ -48,10 +49,9 @@ allprojects {
dependencies { dependencies {
implementation(compose.desktop.currentOs) implementation(compose.desktop.currentOs)
implementation(compose.materialIconsExtended)
implementation("com.fasterxml.jackson.core:jackson-databind:2.10.0") implementation("com.github.ajalt.clikt:clikt:3.3.0")
implementation("com.github.ajalt:clikt:2.2.0")
implementation("org.jetbrains.compose.material:material-icons-extended:0.4.0")
implementation("com.ibm.icu:icu4j:70.1") implementation("com.ibm.icu:icu4j:70.1")
implementation(project(path = ":briar-core", configuration = "default")) implementation(project(path = ":briar-core", configuration = "default"))
......
pluginManagement { pluginManagement {
repositories { repositories {
gradlePluginPortal() gradlePluginPortal()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
} }
} }
......
package org.briarproject.briar.desktop package org.briarproject.briar.desktop
import com.fasterxml.jackson.databind.ObjectMapper
import dagger.Module import dagger.Module
import dagger.Provides import dagger.Provides
import org.briarproject.bramble.account.AccountModule import org.briarproject.bramble.account.AccountModule
...@@ -96,10 +95,6 @@ internal class DesktopModule( ...@@ -96,10 +95,6 @@ internal class DesktopModule(
} }
} }
@Provides
@Singleton
internal fun provideObjectMapper() = ObjectMapper()
@Provides @Provides
internal fun provideFeatureFlags() = object : FeatureFlags { internal fun provideFeatureFlags() = object : FeatureFlags {
override fun shouldEnableImageAttachments() = false override fun shouldEnableImageAttachments() = false
......
package org.briarproject.briar.desktop package org.briarproject.briar.desktop
import com.fasterxml.jackson.databind.ObjectMapper
import dagger.Module import dagger.Module
import dagger.Provides import dagger.Provides
import org.briarproject.bramble.account.AccountModule import org.briarproject.bramble.account.AccountModule
...@@ -101,10 +100,6 @@ internal class DesktopTestModule( ...@@ -101,10 +100,6 @@ internal class DesktopTestModule(
} }
} }
@Provides
@Singleton
internal fun provideObjectMapper() = ObjectMapper()
@Provides @Provides
internal fun provideFeatureFlags() = object : FeatureFlags { internal fun provideFeatureFlags() = object : FeatureFlags {
override fun shouldEnableImageAttachments() = false override fun shouldEnableImageAttachments() = false
......
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