From 093e8e3b8638d7226ae92d264ebdf415c96e48b7 Mon Sep 17 00:00:00 2001 From: 3llomi Date: Mon, 2 Sep 2024 00:01:43 +0300 Subject: [PATCH 1/3] Updated Fuel Dependency --- build.gradle | 6 ++-- gradle/wrapper/gradle-wrapper.properties | 39 ++---------------------- pythia/build.gradle | 2 +- 3 files changed, 7 insertions(+), 40 deletions(-) diff --git a/build.gradle b/build.gradle index 9eff440..0119ea0 100644 --- a/build.gradle +++ b/build.gradle @@ -34,11 +34,11 @@ buildscript { ext.versions = [ // Kotlin - kotlinVersion : '1.3.61', + kotlinVersion : '1.6.21', coroutines : '1.3.2', // Gradle - gradle : '3.5.3', + gradle : '7.1.2', // Virgil virgilSdk : '7.2.0', @@ -48,7 +48,7 @@ buildscript { gson : '2.8.6', // Network - fuel : '1.15.1', + fuel : '2.3.1', // Android android : '4.1.1.4', diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dfd337d..19a33c3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,39 +1,6 @@ -# -# Copyright (c) 2015-2020, Virgil Security, Inc. -# -# Lead Maintainer: Virgil Security Inc. -# -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# (1) Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# -# (2) Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# (3) Neither the name of virgil nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -#Sat Jan 11 16:56:12 EET 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-all.zip +#Sun Sep 01 23:54:57 EEST 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/pythia/build.gradle b/pythia/build.gradle index 11350c9..b5fa6c7 100644 --- a/pythia/build.gradle +++ b/pythia/build.gradle @@ -35,7 +35,7 @@ plugins { id 'java-library' id 'maven-publish' id 'signing' - id 'maven' +// id 'maven' } sourceCompatibility = 1.8 From 297f6fb487bbeaaf8f5cd37716666e9a04153ba6 Mon Sep 17 00:00:00 2001 From: 3llomi Date: Mon, 2 Sep 2024 15:40:35 +0300 Subject: [PATCH 2/3] Updated Dokka --- build.gradle | 2 +- pythia-android/build.gradle | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 0119ea0..4563b3b 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,7 @@ buildscript { // Publish mavenPublishPlugin: '3.6.2', - dokka : '0.9.17', + dokka : '1.6.21', // Tests testsRunner : '1.2.0', diff --git a/pythia-android/build.gradle b/pythia-android/build.gradle index ce94c49..e6a18f3 100644 --- a/pythia-android/build.gradle +++ b/pythia-android/build.gradle @@ -165,8 +165,6 @@ signing { sign publishing.publications.mavenJava } -dokka { - outputFormat = 'html' - outputDirectory = "$buildDir/javadoc" - reportUndocumented = false +dokkaHtml { + outputDirectory.set(file("$buildDir/javadoc")) } From fe605e68a33e839100444e8bedc732ab19bac3f9 Mon Sep 17 00:00:00 2001 From: 3llomi Date: Mon, 2 Sep 2024 15:43:48 +0300 Subject: [PATCH 3/3] Updated Dokka --- pythia-android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pythia-android/build.gradle b/pythia-android/build.gradle index e6a18f3..238c697 100644 --- a/pythia-android/build.gradle +++ b/pythia-android/build.gradle @@ -99,7 +99,7 @@ task sourcesJar(type: Jar) { classifier = 'sources' } -task javadocJar(type: Jar, dependsOn: 'dokka') { +task javadocJar(type: Jar, dependsOn: 'dokkaHtml') { from("$buildDir/javadoc") classifier = 'javadoc' }