Merge pull request #508 from dropbox/rharter/357

Generates the `DbxSdkVersion` value in a gradle task.
dropbox · Aug 10, 2023 · f4ae190 · f4ae190
2 parents 1737bd8 + 6cdbd7c
commit f4ae190
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 19 deletions.
diff --git a/dropbox-sdk-android/src/main/java/com/dropbox/core/android/internal/DropboxAuthIntent.kt b/dropbox-sdk-android/src/main/java/com/dropbox/core/android/internal/DropboxAuthIntent.kt
@@ -3,7 +3,6 @@ package com.dropbox.core.android.internal
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageInfo
-import android.content.pm.PackageManager
 import com.dropbox.core.DbxSdkVersion
 import com.dropbox.core.android.AuthActivity
 

diff --git a/dropbox-sdk-java/api/dropbox-sdk-java.api b/dropbox-sdk-java/api/dropbox-sdk-java.api
@@ -206,7 +206,7 @@ public abstract class com/dropbox/core/DbxRequestUtil$ResponseHandler {
 	public abstract fun handle (Lcom/dropbox/core/http/HttpRequestor$Response;)Ljava/lang/Object;
 }
 
-public class com/dropbox/core/DbxSdkVersion {
+public final class com/dropbox/core/DbxSdkVersion {
 	public static final field Version Ljava/lang/String;
 	public fun <init> ()V
 }

diff --git a/dropbox-sdk-java/build.gradle b/dropbox-sdk-java/build.gradle
@@ -27,11 +27,32 @@ ext {
     authInfoPropertyName = 'com.dropbox.test.authInfoFile'
 }
 
+tasks.register('versionWriterTask') {
+    def versionName = project.property("VERSION_NAME")
+    it.inputs.property("versionName", versionName)
+
+    def generatedDir = project.layout.buildDirectory.dir("generated/version")
+    it.outputs.dir(generatedDir)
+
+    it.doLast {
+        def versionFile = generatedDir.get().file("com/dropbox/core/DbxSdkVersion.java").asFile
+        versionFile.parentFile.mkdirs()
+        versionFile.text = """// Generated file. Do not edit
+package com.dropbox.core;
+
+public final class DbxSdkVersion {
+    public static final String Version = "${versionName}";
+}
+"""
+    }
+}
+
 sourceSets {
     main {
         java {
             // Including the Android Code this way until it is later released as a separate artifact
             srcDir '../dropbox-sdk-android/src/main/java'
+            srcDir(versionWriterTask)
         }
     }
 }

diff --git a/dropbox-sdk-java/src/main/java/com/dropbox/core/DbxSdkVersion.java b/dropbox-sdk-java/src/main/java/com/dropbox/core/DbxSdkVersion.java