diff --git a/CHANGELOG.md b/CHANGELOG.md index dbdeb7c8..b7944c7d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,13 @@ +## 24.1.4 + +* Cleaned up unused gradle dependencies from root build.gradle. + ## 24.1.3 * Extended minimum JDK support to 8. ## 24.1.2 + * !! Major Breaking Change !! Minimum JDK support is 19 for this minor. * Migrated from Sonatype OSSRH. @@ -214,3 +219,4 @@ * initial SDK release * MavenCentral rerelease + diff --git a/build.gradle b/build.gradle index 8a55cf4f..31db9934 100644 --- a/build.gradle +++ b/build.gradle @@ -1,37 +1,21 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - repositories { - google() - mavenCentral() - jcenter() - maven { - url "https://maven.google.com" - } - } - dependencies { - classpath 'com.android.tools.build:gradle:8.1.4' - classpath 'com.github.dcendents:android-maven-plugin:1.2' - classpath 'com.google.gms:google-services:4.4.2' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } + repositories { + google() + mavenCentral() + } } allprojects { - ext.CLY_VERSION = "24.1.3" - ext.POWERMOCK_VERSION = "1.7.4" + ext.CLY_VERSION = "24.1.3" + ext.POWERMOCK_VERSION = "1.7.4" - tasks.withType(Javadoc) { - options.addStringOption('Xdoclint:none', '-quiet') - } - repositories { - google() - jcenter() - //mavenLocal() - maven { - url "https://maven.google.com" // Google's Maven repository - } - } + tasks.withType(Javadoc) { + options.addStringOption('Xdoclint:none', '-quiet') + } + repositories { + google() + mavenCentral() + } } diff --git a/sdk-java/build.gradle b/sdk-java/build.gradle index 5c80b57c..76790b55 100644 --- a/sdk-java/build.gradle +++ b/sdk-java/build.gradle @@ -8,7 +8,11 @@ buildscript { //mavenLocal() } dependencies { - classpath 'com.vanniktech:gradle-maven-publish-plugin:0.28.0' //for publishing + // Load publish plugin ONLY when publish task is requested + if (gradle.startParameter.taskNames.any { it.toLowerCase().contains("publish") }) { + // This requires minimum java 11 to work + classpath 'com.vanniktech:gradle-maven-publish-plugin:0.28.0' + } } } @@ -28,4 +32,6 @@ dependencies { //testImplementation 'com.squareup.okhttp3:mockwebserver:3.7.0' } -apply plugin: "com.vanniktech.maven.publish" +if (gradle.startParameter.taskNames.any { it.toLowerCase().contains("publish") }) { + apply plugin: "com.vanniktech.maven.publish" +}