From 0b3bada853fb365786541c771ccadc80ccf8b559 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20K=C3=BCrten?= <sebastian@mobanisto.de>
Date: Thu, 14 Oct 2021 11:06:33 +0200
Subject: [PATCH] Make it possible to use unmodified upstream briar
---
briar | 2 +-
build.gradle.kts | 39 ++++++++++++++++++++++++++++++++-------
settings.gradle.kts | 15 ++++++++++-----
3 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/briar b/briar
index 4a0f8b2669..445ef0818c 160000
--- a/briar
+++ b/briar
@@ -1 +1 @@
-Subproject commit 4a0f8b266975d326a561559ab427b3a183c5a75d
+Subproject commit 445ef0818cb80a4b7e4c1f4370293b0f869c2ece
diff --git a/build.gradle.kts b/build.gradle.kts
index 58b1010d60..97a1d8f668 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,6 +2,29 @@ import org.jetbrains.compose.compose
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+buildscript {
+ repositories {
+ jcenter()
+ mavenLocal()
+ google()
+ maven("https://plugins.gradle.org/m2/")
+ }
+
+ // keep version here in sync when updating briar
+ dependencies {
+ classpath("com.android.tools.build:gradle:4.1.3")
+ classpath("ru.vyarus:gradle-animalsniffer-plugin:1.5.0")
+ classpath(files("briar/libs/gradle-witness.jar"))
+ }
+
+ // keep version here in sync when updating briar
+ extra.apply {
+ set("dagger_version", "2.33")
+ set("junit_version", "4.13.2")
+ set("jmock_version", "2.12.0")
+ }
+}
+
plugins {
kotlin("jvm") version "1.5.21"
kotlin("kapt") version "1.5.21"
@@ -14,11 +37,13 @@ plugins {
group = "app.briar.desktop"
version = "0.1"
-repositories {
- mavenCentral()
- maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
- google()
- jcenter()
+allprojects {
+ repositories {
+ mavenCentral()
+ maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+ google()
+ jcenter()
+ }
}
dependencies {
@@ -28,8 +53,8 @@ dependencies {
implementation("com.github.ajalt:clikt:2.2.0")
implementation("org.jetbrains.compose.material:material-icons-extended:0.4.0")
- implementation(project(path = ":briar:briar-core", configuration = "default"))
- implementation(project(path = ":briar:bramble-java", configuration = "default"))
+ implementation(project(path = ":briar-core", configuration = "default"))
+ implementation(project(path = ":bramble-java", configuration = "default"))
val daggerVersion = "2.24"
kapt("com.google.dagger:dagger-compiler:$daggerVersion")
diff --git a/settings.gradle.kts b/settings.gradle.kts
index c62cffd735..4acdb94410 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -7,8 +7,13 @@ pluginManagement {
rootProject.name = "briar-desktop"
-include("briar:bramble-api")
-include("briar:bramble-core")
-include("briar:bramble-java")
-include("briar:briar-api")
-include("briar:briar-core")
+include(":bramble-api")
+include(":bramble-core")
+include(":bramble-java")
+include(":briar-api")
+include(":briar-core")
+project(":bramble-api").projectDir = file("briar/bramble-api")
+project(":bramble-core").projectDir = file("briar/bramble-core")
+project(":bramble-java").projectDir = file("briar/bramble-java")
+project(":briar-api").projectDir = file("briar/briar-api")
+project(":briar-core").projectDir = file("briar/briar-core")
--
GitLab