From 1347b0f1c923926aa9d97ece73d80dd5c35e68e0 Mon Sep 17 00:00:00 2001 From: DatLag Date: Sat, 20 Apr 2024 15:55:20 +0200 Subject: [PATCH] fix thrift error during build --- build.gradle.kts | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- jcef/build.gradle.kts | 2 ++ jcef/src/main | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 813d21ce..a7788377 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,8 +4,8 @@ plugins { kotlin("jvm") version "1.9.21" apply false kotlin("plugin.serialization") version "1.9.21" apply false id("org.jetbrains.compose") version "1.5.11" apply false - id("com.vanniktech.maven.publish") version "0.25.3" apply false - id("org.jetbrains.dokka") version "1.9.10" + id("com.vanniktech.maven.publish") version "0.28.0" apply false + id("org.jetbrains.dokka") version "1.9.20" } buildscript { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 62f495df..a80b22ce 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/jcef/build.gradle.kts b/jcef/build.gradle.kts index 642a2971..a65bb2f1 100644 --- a/jcef/build.gradle.kts +++ b/jcef/build.gradle.kts @@ -11,6 +11,8 @@ plugins { dependencies { implementation("org.jogamp.gluegen:gluegen-rt:2.5.0") implementation("org.jogamp.jogl:jogl-all:2.5.0") + + implementation(files("src/main/third_party/thrift/libthrift-0.19.0.jar")) } mavenPublishing { diff --git a/jcef/src/main b/jcef/src/main index 461fa732..7ecb9fb3 160000 --- a/jcef/src/main +++ b/jcef/src/main @@ -1 +1 @@ -Subproject commit 461fa732ae57fc73a6532a2b66f6a84c4b66f245 +Subproject commit 7ecb9fb31a24bd765915bf84e6a75c1fd92bde4b