dokka to generate autogenerated lombak files

ForgeRock · Dec 14, 2023 · b7843d3 · b7843d3
1 parent 8ebf0ff
commit b7843d3
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,6 +6,7 @@
  */
 
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+import org.jetbrains.dokka.gradle.DokkaTask
 
 buildscript {
     ext {
@@ -37,6 +38,24 @@ plugins {
     id("org.jetbrains.dokka") version "1.9.10"
 }
 
+// Note: To configure multi-project builds, you need
+//       to configure Partial tasks of the subprojects.
+//       See "Configuration example" section of documentation.
+//tasks.withType(DokkaTask.class) {
+//    dokkaSourceSets {
+//        configureEach {
+//            documentedVisibilities.set(
+//                    setOf(
+//                            org.jetbrains.dokka.DokkaConfiguration.Visibility.PUBLIC, // Same for both Kotlin and Java
+//                            org.jetbrains.dokka.DokkaConfiguration.Visibility.PRIVATE, // Same for both Kotlin and Java
+//                            org.jetbrains.dokka.DokkaConfiguration.Visibility.PROTECTED, // Same for both Kotlin and Java
+//                            org.jetbrains.dokka.DokkaConfiguration.Visibility.INTERNAL, // Kotlin-specific internal modifier
+//                            org.jetbrains.dokka.DokkaConfiguration.Visibility.PACKAGE, // Java-specific package-private visibility
+//                    )
+//            )
+//        }
+//    }
+//}
 
 allprojects {
     configurations.all {

diff --git a/config/kdoc.gradle b/config/kdoc.gradle
@@ -23,6 +23,10 @@ task delombok {
                 classname: 'lombok.delombok.ant.Tasks$Delombok',
                 classpath: configurations.delombok.asPath)
         ant.delombok(verbose: 'true', from: srcJava, to: "$buildDir/src-delomboked")
+        copy {
+            from "$buildDir/src-delomboked"
+            into "src/main/java"
+        }
     }
 }
 
@@ -41,8 +45,8 @@ dokkaJavadoc {
         named("main") {
             displayName.set(name)
             outputDirectory = file("build/javadoc/$project.name-dokka")
-            sourceDirs = files("$buildDir/src-delomboked")
-            sourceRoots.setFrom(file("$buildDir/src-delomboked"))
+//            sourceDirs = files("$buildDir/src-delomboked")
+//            sourceRoots.setFrom(file("$buildDir/src-delomboked"))
             reportUndocumented.set(false)
             skipEmptyPackages.set(true)
             skipDeprecated.set(false)
@@ -53,6 +57,12 @@ dokkaJavadoc {
             suppress.set(false)
         }
     }
+    doLast {
+        exec {
+            workingDir project.rootDir
+            commandLine 'git', 'checkout', '.'
+        }
+    }
 }
 
 tasks.named("dokkaHtml").configure {
@@ -66,14 +76,19 @@ dokkaHtml {
     dokkaSourceSets {
         named("main") {
             outputDirectory = file("build/html/$project.name-dokka")
-            sourceDirs = files("$buildDir/src-delomboked")
-            sourceRoots.setFrom(file("$buildDir/src-delomboked"))
+            // sourceDirs = files("$buildDir/src-delomboked")
+            // sourceRoots.setFrom(file("$buildDir/src-delomboked"))
             noAndroidSdkLink.set(false)
             includeNonPublic.set(true)
             skipEmptyPackages.set(true)
             reportUndocumented.set(true)
             skipDeprecated.set(false)
-
+        }
+    }
+    doLast {
+        exec {
+            workingDir project.rootDir
+            commandLine 'git', 'checkout', '.'
         }
     }
 }

diff --git a/.../org/forgerock/android/auth/callback/DeviceSigningVerifierApplicationPinCallbackTest.java b/.../org/forgerock/android/auth/callback/DeviceSigningVerifierApplicationPinCallbackTest.java
@@ -33,6 +33,8 @@
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.ExecutionException;
 public class DeviceSigningVerifierApplicationPinCallbackTest extends BaseDeviceBindingTest {
     protected final static String TREE = "device-verifier";
@@ -113,7 +115,11 @@ public void onCallbackReceived(Node node) {
                     Assert.assertNotNull(callback.getUserId());
                     Assert.assertNotNull(callback.getChallenge());
 
-                    callback.sign(context, Collections.emptyMap(), new DefaultUserKeySelector(),
+                    Map<String, String> map  = new HashMap<>() {{
+                        put("os", "value1");
+                    }};
+
+                    callback.sign(context, map, new DefaultUserKeySelector(),
                             deviceBindingAuthenticationType -> new ApplicationPinDeviceAuthenticator((prompt, fragmentActivity, $completion) -> APPLICATION_PIN.toCharArray()),
                             new FRListener<Void>() {
                                 @Override