From a656e759cc193717a5bfce98d13095d604e2a5de Mon Sep 17 00:00:00 2001
From: Nico <nico@briarproject.org>
Date: Wed, 14 Aug 2024 12:53:16 +0000
Subject: [PATCH] Update briar core to 1.5.12
---
briar | 2 +-
briar-desktop/build.gradle.kts | 6 +++---
build.gradle.kts | 11 ++++++-----
.../desktop/builddata/GenerateBuildDataSourceTask.kt | 10 ++++++++++
4 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/briar b/briar
index f16875c602..2af1e5c421 160000
--- a/briar
+++ b/briar
@@ -1 +1 @@
-Subproject commit f16875c6025701498ef8a1a988be8dd86dba7c38
+Subproject commit 2af1e5c421f75068f30b1bb5b0f789b0623120a9
diff --git a/briar-desktop/build.gradle.kts b/briar-desktop/build.gradle.kts
index 93d54fb849..1254cc11b3 100644
--- a/briar-desktop/build.gradle.kts
+++ b/briar-desktop/build.gradle.kts
@@ -22,9 +22,9 @@ import org.briarproject.briar.desktop.os.currentOS
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins {
- kotlin("jvm") version "1.7.20"
- kotlin("kapt") version "1.7.20"
- id("org.jetbrains.compose") version "1.4.3"
+ kotlin("jvm") version "1.9.10"
+ kotlin("kapt") version "1.9.10"
+ id("org.jetbrains.compose") version "1.6.11"
id("de.mobanisto.pinpit") version "0.9.0"
id("java")
id("idea")
diff --git a/build.gradle.kts b/build.gradle.kts
index 0ba55cd79f..3ec523eb52 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -34,19 +34,20 @@ buildscript {
// keep version here in sync when updating briar
extra.apply {
- set("kotlin_version", "1.8.20") // todo: different version used in Briar-Desktop?!
- set("dagger_version", "2.45")
- set("okhttp_version", "4.10.0")
+ // when updating kotlin_version, also update briar-desktop/build.gradle.kts kotlin("jvm") and kotlin("kapt")
+ set("kotlin_version", "1.9.10") // mind the comment above!
+ set("dagger_version", "2.51.1")
+ set("okhttp_version", "4.12.0")
set("jackson_version", "2.13.4")
set("tor_version", "0.4.8.9-1")
set("obfs4proxy_version", "0.0.14-tor2")
- set("snowflake_version", "2.5.1")
+ set("snowflake_version", "2.9.1")
set("jsoup_version", "1.15.3")
set("bouncy_castle_version", "1.71")
set("junit_version", "4.13.2")
set("jmock_version", "2.12.0")
set("mockwebserver_version", "4.10.0")
- set("onionwrapper_version", "0.0.7")
+ set("onionwrapper_version", "0.1.1")
}
}
diff --git a/buildSrc/src/main/kotlin/org/briarproject/briar/desktop/builddata/GenerateBuildDataSourceTask.kt b/buildSrc/src/main/kotlin/org/briarproject/briar/desktop/builddata/GenerateBuildDataSourceTask.kt
index e46fc41481..f9e74290e2 100644
--- a/buildSrc/src/main/kotlin/org/briarproject/briar/desktop/builddata/GenerateBuildDataSourceTask.kt
+++ b/buildSrc/src/main/kotlin/org/briarproject/briar/desktop/builddata/GenerateBuildDataSourceTask.kt
@@ -43,6 +43,12 @@ open class GenerateBuildDataSourceTask : AbstractBuildDataTask() {
companion object {
val LICENSES = buildMap {
+ put(UnversionedArtifact("androidx.annotation", "annotation-jvm"), "Apache 2.0")
+ put(UnversionedArtifact("androidx.arch.core", "core-common"), "Apache 2.0")
+ put(UnversionedArtifact("androidx.collection", "collection-jvm"), "Apache 2.0")
+ put(UnversionedArtifact("androidx.lifecycle", "lifecycle-common-jvm"), "Apache 2.0")
+ put(UnversionedArtifact("androidx.lifecycle", "lifecycle-runtime-desktop"), "Apache 2.0")
+ put(UnversionedArtifact("androidx.lifecycle", "lifecycle-viewmodel-desktop"), "Apache 2.0")
put(UnversionedArtifact("ch.qos.logback", "logback-classic"), "EPL 1.0/LGPL 2.1")
put(UnversionedArtifact("ch.qos.logback", "logback-core"), "EPL 1.0/LGPL 2.1")
put(UnversionedArtifact("com.fasterxml.jackson.core", "jackson-annotations"), "Apache 2.0")
@@ -74,6 +80,10 @@ open class GenerateBuildDataSourceTask : AbstractBuildDataTask() {
put(UnversionedArtifact("org.bytedeco", "javacpp"), "Apache 2.0")
put(UnversionedArtifact("org.jdom", "jdom2"), "JDOM (Apache without acknowledgment clause)")
put(UnversionedArtifact("org.jetbrains", "annotations"), "Apache 2.0")
+ put(
+ UnversionedArtifact("org.jetbrains.androidx.lifecycle", "lifecycle-runtime-compose-desktop"),
+ "Apache 2.0"
+ )
put(UnversionedArtifact("org.jetbrains.compose.animation", "animation-core-desktop"), "Apache 2.0")
put(UnversionedArtifact("org.jetbrains.compose.animation", "animation-desktop"), "Apache 2.0")
put(UnversionedArtifact("org.jetbrains.compose.desktop", "desktop-jvm"), "Apache 2.0")
--
GitLab