Migrate all build.gradle to version catalog and use plugin block. (#436)

* version catalog migration;

* add version catalog to examples and remove plugins from classpath

* address code review comments

* move version bump info to seperate branch

* add publish plugin to :examples

* Added dependency guard

* Enabled Dependency Guard for Example App

* Added dependency guard github action.

Co-authored-by: Jay Palacio <[email protected]>
Co-authored-by: Sam Edwards <[email protected]>

Author: 3 people

.github/workflows/ci-tests.yml

@@ -50,6 +50,9 @@ jobs:
         REFRESH_TOKEN: ${{ secrets.REFRESH_TOKEN }}
       run: ./generate-ci-auth-file
 
+    - name: Dependency Guard
+      run: ./gradlew dependencyGuard
+
     - name: Check
       run: ./gradlew check
 

ReadMe.md

@@ -41,7 +41,7 @@ You can also download the Java SDK JAR and and its required dependencies directl
 
 ## Dropbox for Java tutorial
 
-A good way to start using the Java SDK is to follow this quick tutorial. Just make sure you have the the Java SDK [installed](#setup) first!
+A good way to start using the Java SDK is to follow this quick tutorial. Just make sure you have the Java SDK [installed](#setup) first!
 
 ### Register a Dropbox API app
 

build.gradle

@@ -1,3 +1,4 @@
+
 buildscript {
     repositories {
         google()
@@ -6,15 +7,17 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.github.ben-manes:gradle-versions-plugin:0.27.0'
         classpath files('gradle/dropbox-pem-converter-plugin')
-        classpath 'gradle.plugin.com.github.blindpirate:gradle-legacy-osgi-plugin:0.0.6'
-        classpath "com.vanniktech:gradle-maven-publish-plugin:0.18.0"
         classpath(dropboxJavaSdkLibs.android.gradle.plugin)
         classpath(dropboxJavaSdkLibs.kotlin.gradle.plugin)
     }
 }
 
+plugins {
+    alias(dropboxJavaSdkLibs.plugins.maven.publish.plugin) apply false
+    alias(dropboxJavaSdkLibs.plugins.gradle.version.plugin) apply false
+    alias(dropboxJavaSdkLibs.plugins.dependency.guard)
+}
 
 allprojects {
     repositories {
@@ -28,3 +31,7 @@ allprojects {
         }
     }
 }
+
+dependencyGuard {
+    configuration("classpath")
+}

dependencies/classpath.txt

@@ -1,6 +1,5 @@
 androidx.databinding:databinding-common:7.2.2
 androidx.databinding:databinding-compiler-common:7.2.2
-biz.aQute.bnd:biz.aQute.bndlib:5.2.0
 com.android.databinding:baseLibrary:7.2.2
 com.android.tools.analytics-library:crash:30.2.2
 com.android.tools.analytics-library:protos:30.2.2
@@ -38,6 +37,7 @@ com.android.tools:sdk-common:30.2.2
 com.android.tools:sdklib:30.2.2
 com.android:signflinger:7.2.2
 com.android:zipflinger:7.2.2
+com.dropbox.dependency-guard:com.dropbox.dependency-guard.gradle.plugin:0.3.2
 com.dropbox.dependency-guard:dependency-guard:0.3.2
 com.fasterxml.jackson.core:jackson-annotations:2.11.1
 com.fasterxml.jackson.core:jackson-core:2.11.1
@@ -46,7 +46,8 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.11.1
 com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.11.1
 com.fasterxml.jackson.module:jackson-module-kotlin:2.11.1
 com.fasterxml.woodstox:woodstox-core:6.2.1
-com.github.ben-manes:gradle-versions-plugin:0.27.0
+com.github.ben-manes.versions:com.github.ben-manes.versions.gradle.plugin:0.42.0
+com.github.ben-manes:gradle-versions-plugin:0.42.0
 com.github.gundy:semver4j:0.16.4
 com.google.android:annotations:4.1.1.4
 com.google.api.grpc:proto-google-common-protos:1.12.0
@@ -77,13 +78,14 @@ com.squareup:javawriter:2.5.0
 com.sun.activation:javax.activation:1.2.0
 com.sun.istack:istack-commons-runtime:3.0.8
 com.sun.xml.fastinfoset:FastInfoset:1.2.16
-com.thoughtworks.xstream:xstream:1.4.10
+com.thoughtworks.xstream:xstream:1.4.17
+com.vanniktech.maven.publish:com.vanniktech.maven.publish.gradle.plugin:0.18.0
 com.vanniktech:gradle-maven-publish-plugin:0.18.0
 commons-codec:commons-codec:1.11
 commons-io:commons-io:2.4
 commons-logging:commons-logging:1.2
 de.undercouch:gradle-download-task:4.1.1
-gradle.plugin.com.github.blindpirate:gradle-legacy-osgi-plugin:0.0.6
+io.github.x-stream:mxparser:1.2.1
 io.grpc:grpc-api:1.21.1
 io.grpc:grpc-context:1.21.1
 io.grpc:grpc-core:1.21.1
@@ -169,4 +171,3 @@ org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2
 xerces:xercesImpl:2.12.0
 xml-apis:xml-apis:1.4.01
 xmlpull:xmlpull:1.1.3.1
-xpp3:xpp3_min:1.1.4c

dropbox-sdk-android/build.gradle

@@ -1,9 +1,11 @@
 plugins {
     id 'org.jetbrains.kotlinx.binary-compatibility-validator' version '0.11.1'
+    alias(dropboxJavaSdkLibs.plugins.maven.publish.plugin)
+    alias(dropboxJavaSdkLibs.plugins.gradle.version.plugin)
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+    alias(dropboxJavaSdkLibs.plugins.dependency.guard)
 }
-apply plugin: "com.android.library"
-apply plugin: "org.jetbrains.kotlin.android"
-apply plugin: 'com.vanniktech.maven.publish'
 
 android {
     compileSdk 33
@@ -17,7 +19,10 @@ android {
     }
 }
 
-
 dependencies {
     api(project(path: ":dropbox-sdk-java", configuration: "withoutOsgi"))
-}
+}
+
+dependencyGuard {
+    configuration("releaseRuntimeClasspath")
+}

dropbox-sdk-java/build.gradle

@@ -1,7 +1,11 @@
-apply plugin: 'java-library'
-apply plugin: 'com.github.blindpirate.osgi'
-apply plugin: 'com.github.ben-manes.versions' // dependencyUpdates task
-apply plugin: 'com.vanniktech.maven.publish'
+plugins {
+    id 'java-library'
+    id "com.github.blindpirate.osgi" version "0.0.6"
+    alias(dropboxJavaSdkLibs.plugins.gradle.version.plugin)
+    alias(dropboxJavaSdkLibs.plugins.maven.publish.plugin)
+    alias(dropboxJavaSdkLibs.plugins.dependency.guard)
+}
+
 
 sourceCompatibility = JavaVersion.VERSION_11
 targetCompatibility = JavaVersion.VERSION_11
@@ -16,12 +20,12 @@ ext {
 dependencies {
     // Important: Jackson 2.8+ will be free to use JDK7 features and no longer guarantees JDK6
     //            compatibility
-    api 'com.fasterxml.jackson.core:jackson-core:2.7.9'
+    api(dropboxJavaSdkLibs.jackson.core)
 
-    compileOnly 'javax.servlet:servlet-api:2.5'
-    compileOnly 'com.squareup.okhttp:okhttp:2.7.5'  // support both v2 and v3 to avoid
-    compileOnly 'com.squareup.okhttp3:okhttp:4.0.0' // method count bloat
-    compileOnly 'com.google.appengine:appengine-api-1.0-sdk:1.9.38'
+    compileOnly(dropboxJavaSdkLibs.servlet.api)
+    compileOnly(dropboxJavaSdkLibs.okhttp2)  // support both v2 and v3 to avoid
+    compileOnly(dropboxJavaSdkLibs.okhttp3) // method count bloat
+    compileOnly(dropboxJavaSdkLibs.appengine.api)
 
     testImplementation 'org.testng:testng:6.9.10'
     testImplementation 'org.mockito:mockito-core:1.10.19'
@@ -226,3 +230,8 @@ dependencyUpdates.resolutionStrategy = {
 }
 
 apply from: 'stone.gradle'
+
+dependencyGuard {
+    configuration("runtimeClasspath")
+    configuration("compileClasspath")
+}

examples/android/build.gradle

@@ -1,5 +1,8 @@
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
+plugins {
+    id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+    alias(dropboxJavaSdkLibs.plugins.dependency.guard)
+}
 
 android {
     compileSdkVersion 33
@@ -58,24 +61,24 @@ android {
 dependencies {
     implementation(project(":dropbox-sdk-android"))
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.6.21"
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.3'
+    implementation(dropboxJavaSdkLibs.kotlin.stdlib)
+    implementation(dropboxJavaSdkLibs.kotlin.coroutines)
 
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.core:core-ktx:1.8.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1"
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation(dropboxJavaSdkLibs.androidx.appcompat)
+    implementation(dropboxJavaSdkLibs.androidx.recyclerview)
+    implementation(dropboxJavaSdkLibs.androidx.core.ktx)
+    implementation(dropboxJavaSdkLibs.androidx.constraintlayout)
+    implementation(dropboxJavaSdkLibs.androidx.lifecycle.runtime.ktx)
+    implementation(dropboxJavaSdkLibs.android.material)
 
-    implementation 'com.github.bumptech.glide:glide:4.12.0'
+    implementation(dropboxJavaSdkLibs.glide)
 
-    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
+    implementation(dropboxJavaSdkLibs.okhttp3)
 
-    testImplementation 'junit:junit:4.13.2'
+    testImplementation(dropboxJavaSdkLibs.test.junit)
 
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation(dropboxJavaSdkLibs.androidx.test.junit)
+    androidTestImplementation(dropboxJavaSdkLibs.androidx.test.espresso.core)
 }
 
 def getLocalProperties() {
@@ -84,4 +87,8 @@ def getLocalProperties() {
         props.load(new FileInputStream(file('local.properties')))
     }
     return props
-}
+}
+
+dependencyGuard {
+    configuration("releaseRuntimeClasspath")
+}

examples/android/dependencies/releaseRuntimeClasspath.txt

@@ -0,0 +1,66 @@
+androidx.activity:activity:1.2.4
+androidx.annotation:annotation-experimental:1.1.0
+androidx.annotation:annotation:1.3.0
+androidx.appcompat:appcompat-resources:1.4.2
+androidx.appcompat:appcompat:1.4.2
+androidx.arch.core:core-common:2.1.0
+androidx.arch.core:core-runtime:2.1.0
+androidx.cardview:cardview:1.0.0
+androidx.collection:collection:1.1.0
+androidx.concurrent:concurrent-futures:1.0.0
+androidx.constraintlayout:constraintlayout-core:1.0.4
+androidx.constraintlayout:constraintlayout:2.1.4
+androidx.coordinatorlayout:coordinatorlayout:1.1.0
+androidx.core:core-ktx:1.8.0
+androidx.core:core:1.8.0
+androidx.cursoradapter:cursoradapter:1.0.0
+androidx.customview:customview:1.1.0
+androidx.documentfile:documentfile:1.0.0
+androidx.drawerlayout:drawerlayout:1.1.1
+androidx.dynamicanimation:dynamicanimation:1.0.0
+androidx.emoji2:emoji2-views-helper:1.0.0
+androidx.emoji2:emoji2:1.0.0
+androidx.exifinterface:exifinterface:1.2.0
+androidx.fragment:fragment:1.3.6
+androidx.interpolator:interpolator:1.0.0
+androidx.legacy:legacy-support-core-utils:1.0.0
+androidx.lifecycle:lifecycle-common:2.5.1
+androidx.lifecycle:lifecycle-livedata-core:2.3.1
+androidx.lifecycle:lifecycle-livedata:2.0.0
+androidx.lifecycle:lifecycle-process:2.4.0
+androidx.lifecycle:lifecycle-runtime-ktx:2.5.1
+androidx.lifecycle:lifecycle-runtime:2.5.1
+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1
+androidx.lifecycle:lifecycle-viewmodel:2.3.1
+androidx.loader:loader:1.0.0
+androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
+androidx.print:print:1.0.0
+androidx.recyclerview:recyclerview:1.2.1
+androidx.resourceinspection:resourceinspection-annotation:1.0.0
+androidx.savedstate:savedstate:1.1.0
+androidx.startup:startup-runtime:1.0.0
+androidx.tracing:tracing:1.0.0
+androidx.transition:transition:1.2.0
+androidx.vectordrawable:vectordrawable-animated:1.1.0
+androidx.vectordrawable:vectordrawable:1.1.0
+androidx.versionedparcelable:versionedparcelable:1.1.1
+androidx.viewpager2:viewpager2:1.0.0
+androidx.viewpager:viewpager:1.0.0
+com.fasterxml.jackson.core:jackson-core:2.7.9
+com.github.bumptech.glide:annotations:4.12.0
+com.github.bumptech.glide:disklrucache:4.12.0
+com.github.bumptech.glide:gifdecoder:4.12.0
+com.github.bumptech.glide:glide:4.12.0
+com.google.android.material:material:1.6.1
+com.google.guava:listenablefuture:1.0
+com.squareup.okhttp3:okhttp:4.0.0
+com.squareup.okio:okio:2.2.2
+org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21
+org.jetbrains.kotlin:kotlin-stdlib:1.6.21
+org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4
+org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4
+org.jetbrains:annotations:13.0

examples/build.gradle

@@ -2,18 +2,19 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        maven { url 'https://plugins.gradle.org/m2/' }
+        gradlePluginPortal()
     }
     dependencies {
         classpath "com.android.tools.build:gradle:7.2.1"
-        classpath 'com.github.ben-manes:gradle-versions-plugin:0.27.0'
         classpath files('../gradle/dropbox-pem-converter-plugin')
-        classpath 'gradle.plugin.com.github.blindpirate:gradle-legacy-osgi-plugin:0.0.6'
-        classpath "com.vanniktech:gradle-maven-publish-plugin:0.18.0"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21"
     }
 }
 
+plugins {
+    alias(dropboxJavaSdkLibs.plugins.maven.publish.plugin) apply false
+}
+
 allprojects {
     repositories {
         google()

examples/settings.gradle

@@ -15,3 +15,11 @@ include ':dropbox-sdk-android'
 
 project(":dropbox-sdk-android").projectDir = file("../dropbox-sdk-android")
 project(":dropbox-sdk-java").projectDir = file("../dropbox-sdk-java")
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        dropboxJavaSdkLibs {
+            from(files("../gradle/dropboxJavaSdkLibs.versions.toml"))
+        }
+    }
+}