Version catalog migration (#502)

dropbox-sdk-android/build.gradle

@@ -8,10 +8,10 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    compileSdk dropboxJavaSdkLibs.versions.android.compile.sdk.get().toInteger()
     defaultConfig {
-        minSdk 21
-        targetSdk 33
+        minSdk dropboxJavaSdkLibs.versions.android.min.sdk.get().toInteger()
+        targetSdk dropboxJavaSdkLibs.versions.android.target.sdk.get().toInteger()
     }
 
     kotlinOptions {

dropbox-sdk-java/build.gradle

@@ -39,26 +39,25 @@ sourceSets {
 dependencies {
     api(dropboxJavaSdkLibs.jackson.core)
 
-    // Android
-    compileOnly 'com.google.android:android:4.1.1.4' // Until 6.x when we have an Android Artifact
-    compileOnly(dropboxJavaSdkLibs.kotlin.stdlib) // Only used in Android Code
-    compileOnly(dropboxJavaSdkLibs.jakarta.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:5.4.0'
-    testImplementation 'org.openjdk.jmh:jmh-core:1.12'
-    testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:1.12'
-    testImplementation 'com.google.appengine:appengine-api-1.0-sdk:1.9.38'
-    testImplementation 'com.google.appengine:appengine-api-labs:1.9.38'
-    testImplementation 'com.google.appengine:appengine-api-stubs:1.9.38'
-    testImplementation 'com.google.appengine:appengine-testing:1.9.38'
-    testImplementation 'com.squareup.okhttp:okhttp:2.7.5'
-    testImplementation 'com.squareup.okhttp3:okhttp:4.0.0'
-    testImplementation 'com.google.guava:guava:19.0'
-    testImplementation "com.google.truth:truth:1.1.2"
+    compileOnly dropboxJavaSdkLibs.android.jar
+    compileOnly dropboxJavaSdkLibs.appengine.api
+    compileOnly dropboxJavaSdkLibs.jakarta.servlet.api
+    compileOnly dropboxJavaSdkLibs.kotlin.stdlib
+    compileOnly dropboxJavaSdkLibs.okhttp2
+    compileOnly dropboxJavaSdkLibs.okhttp3
+
+    testImplementation dropboxJavaSdkLibs.appengine.api
+    testImplementation dropboxJavaSdkLibs.appengine.api.labs
+    testImplementation dropboxJavaSdkLibs.appengine.api.stubs
+    testImplementation dropboxJavaSdkLibs.appengine.testing
+    testImplementation dropboxJavaSdkLibs.guava
+    testImplementation dropboxJavaSdkLibs.jmh.core
+    testImplementation dropboxJavaSdkLibs.jmh.generator
+    testImplementation dropboxJavaSdkLibs.mockito.core
+    testImplementation dropboxJavaSdkLibs.okhttp2
+    testImplementation dropboxJavaSdkLibs.okhttp3
+    testImplementation dropboxJavaSdkLibs.testng
+    testImplementation dropboxJavaSdkLibs.truth
 }
 
 configurations {

examples/android/build.gradle

@@ -5,13 +5,13 @@ plugins {
 }
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion "33.0.0"
+    compileSdkVersion dropboxJavaSdkLibs.versions.android.compile.sdk.get().toInteger()
+    buildToolsVersion "33.0.1"
 
     defaultConfig {
         applicationId "com.dropbox.core.examples.android"
-        minSdkVersion 21
-        targetSdkVersion 33
+        minSdkVersion dropboxJavaSdkLibs.versions.android.min.sdk.get()
+        targetSdkVersion dropboxJavaSdkLibs.versions.android.target.sdk.get()
         versionCode 1
         versionName "1.0"
 
@@ -60,25 +60,21 @@ android {
 
 dependencies {
     implementation(project(":dropbox-sdk-java"))
-
-    implementation(dropboxJavaSdkLibs.kotlin.stdlib)
-    implementation(dropboxJavaSdkLibs.kotlin.coroutines)
-
+    implementation(dropboxJavaSdkLibs.android.material)
     implementation(dropboxJavaSdkLibs.androidx.appcompat)
-    implementation(dropboxJavaSdkLibs.androidx.recyclerview)
-    implementation(dropboxJavaSdkLibs.androidx.core.ktx)
     implementation(dropboxJavaSdkLibs.androidx.constraintlayout)
+    implementation(dropboxJavaSdkLibs.androidx.core.ktx)
     implementation(dropboxJavaSdkLibs.androidx.lifecycle.runtime.ktx)
-    implementation(dropboxJavaSdkLibs.android.material)
-
+    implementation(dropboxJavaSdkLibs.androidx.recyclerview)
     implementation(dropboxJavaSdkLibs.glide)
-
+    implementation(dropboxJavaSdkLibs.kotlin.coroutines)
+    implementation(dropboxJavaSdkLibs.kotlin.stdlib)
     implementation(dropboxJavaSdkLibs.okhttp3)
 
     testImplementation(dropboxJavaSdkLibs.test.junit)
 
-    androidTestImplementation(dropboxJavaSdkLibs.androidx.test.junit)
     androidTestImplementation(dropboxJavaSdkLibs.androidx.test.espresso.core)
+    androidTestImplementation(dropboxJavaSdkLibs.androidx.test.junit)
 }
 
 def getLocalProperties() {

examples/examples/build.gradle

@@ -12,13 +12,13 @@ java {
 
 dependencies {
     implementation(project(":dropbox-sdk-java"))
-    implementation("org.eclipse.jetty:jetty-server:11.0.15")
-    implementation(dropboxJavaSdkLibs.jakarta.servlet.api)
-    implementation("org.apache.commons:commons-lang3:3.4")
+    implementation(dropboxJavaSdkLibs.apache.commons.lang)
     implementation(dropboxJavaSdkLibs.jackson.core)
-    implementation("com.fasterxml.jackson.core:jackson-databind:2.15.0")
+    implementation(dropboxJavaSdkLibs.jackson.databind)
+    implementation(dropboxJavaSdkLibs.jakarta.servlet.api)
+    implementation(dropboxJavaSdkLibs.jetty.server)
+    implementation(dropboxJavaSdkLibs.json)
     implementation(dropboxJavaSdkLibs.okhttp3)
-    implementation("org.json:json:20230618")
 
     testImplementation(dropboxJavaSdkLibs.test.junit)
 }

gradle.properties

@@ -1,6 +1,6 @@
 # POM
 GROUP = com.dropbox.core
-VERSION_NAME=5.4.6-SNAPSHOT
+VERSION_NAME=6.0.0-SNAPSHOT
 
 POM_NAME = Dropbox SDK Java
 POM_DESCRIPTION = A Java library to access Dropbox's HTTP-based Core API v2.
@@ -21,7 +21,6 @@ POM_DEVELOPER_EMAIL = [email protected]
 
 org.gradle.unsafe.configuration-cache=true
 org.gradle.caching=true
-#org.gradle.unsafe.isolated-projects=true
 
 # Use AndroidX
 android.useAndroidX=true

gradle/dropboxJavaSdkLibs.versions.toml

@@ -12,16 +12,22 @@ kotlin-coroutines = "1.6.4"
 
 [libraries]
 android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "android-gradle-plugin" }
+android-jar = 'com.google.android:android:4.1.1.4'
 android-material = 'com.google.android.material:material:1.6.1'
 androidx-activity = { module = "androidx.activity:activity", version.ref = "androidx-activity" }
 androidx-appcompat = 'androidx.appcompat:appcompat:1.4.2'
 androidx-constraintlayout = 'androidx.constraintlayout:constraintlayout:2.1.4'
 androidx-core-ktx = 'androidx.core:core-ktx:1.8.0'
 androidx-lifecycle-runtime-ktx = "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1"
 androidx-recyclerview = 'androidx.recyclerview:recyclerview:1.2.1'
+apache-commons-lang = "org.apache.commons:commons-lang3:3.4"
 appengine-api = 'com.google.appengine:appengine-api-1.0-sdk:1.9.38'
 glide = 'com.github.bumptech.glide:glide:4.12.0'
+guardsquare-proguard-gradle = 'com.guardsquare:proguard-gradle:7.3.1'
 jackson-core = 'com.fasterxml.jackson.core:jackson-core:2.15.0'
+jackson-databind = 'com.fasterxml.jackson.core:jackson-databind:2.15.0'
+jetty-server = "org.eclipse.jetty:jetty-server:11.0.15"
+json = "org.json:json:20230618"
 jakarta-servlet-api = 'jakarta.servlet:jakarta.servlet-api:5.0.0'
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
@@ -36,8 +42,16 @@ okhttp3 = 'com.squareup.okhttp3:okhttp:4.0.0'
 
 androidx-test-junit = 'androidx.test.ext:junit:1.1.3'
 androidx-test-espresso-core = 'androidx.test.espresso:espresso-core:3.4.0'
+appengine-api-labs = 'com.google.appengine:appengine-api-labs:1.9.38'
+appengine-api-stubs = 'com.google.appengine:appengine-api-stubs:1.9.38'
+appengine-testing = 'com.google.appengine:appengine-testing:1.9.38'
+guava = 'com.google.guava:guava:19.0'
+jmh-core = 'org.openjdk.jmh:jmh-core:1.12'
+jmh-generator = 'org.openjdk.jmh:jmh-generator-annprocess:1.12'
+mockito-core = 'org.mockito:mockito-core:5.4.0'
 test-junit = 'junit:junit:4.13.2'
-
+testng = 'org.testng:testng:6.9.10'
+truth = "com.google.truth:truth:1.1.2"
 
 [plugins]
 binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-compatibility-validator" }

proguard/build.gradle

@@ -17,7 +17,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.guardsquare:proguard-gradle:7.3.1'
+        classpath dropboxJavaSdkLibs.guardsquare.proguard.gradle
     }
 }
 
@@ -29,7 +29,7 @@ repositories {
 
 dependencies {
     implementation(project(":dropbox-sdk-java"))
-    implementation("org.testng:testng:6.9.10")
+    implementation(dropboxJavaSdkLibs.testng)
 }
 
 tasks.named("compileJava", JavaCompile).configure {