updated the workflow and dokka task

uber · Feb 20, 2024 · 3aab010 · 3aab010
1 parent 47592d6
commit 3aab010
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '8'
+          java-version: '17'
       - name: Lint and Unit tests
         run: ./gradlew check --stacktrace
       - name: Upload lint and test reports
@@ -25,7 +25,6 @@ jobs:
           path: |
             ./core-android/build/reports
             ./rides-android/build/reports
-
   test:
     runs-on: macOS-latest # enables hardware acceleration in the virtual machine, required for emulator testing
     strategy:
@@ -40,7 +39,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '8'
+          java-version: '17'
       - name: Emulator tests
         uses: reactivecircus/android-emulator-runner@v2
         with:
@@ -57,7 +56,6 @@ jobs:
           path: |
             ./core-android/build/reports
             ./rides-android/build/reports
-
   upload-snapshots:
     runs-on: ubuntu-latest
     if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
@@ -73,9 +71,9 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '8'
+          java-version: '17'
       - name: Upload snapshots
-        run: ./gradlew uploadArchives --stacktrace
+        run: ./gradlew publish --stacktrace
         env:
           ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.SonatypeUsername }}
-          ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.SonatypePassword }}
+          ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.SonatypePassword }}
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -36,6 +36,10 @@ val targetSdkVersion: Int = libs.versions.targetSdkVersion.get().toInt()
 val minSdkVersion: Int = libs.versions.minSdkVersion.get().toInt()
 val jvmTargetVersion = libs.versions.jvmTarget
 
+tasks.dokkaHtmlMultiModule {
+    outputDirectory.set(rootDir.resolve("docs/api/2.x"))
+    includes.from(project.layout.projectDirectory.file("README.md"))
+}
 
 subprojects {
 
@@ -93,12 +97,20 @@ subprojects {
             moduleVersion.set(project.property("VERSION_NAME").toString())
             dokkaSourceSets.configureEach {
                 skipDeprecated.set(true)
-                includes.from("README.md")
                 suppressGeneratedFiles.set(true)
                 suppressInheritedMembers.set(true)
                 externalDocumentationLink {
                     url.set(URI("https://kotlin.github.io/kotlinx.coroutines/index.html").toURL())
                 }
+                perPackageOption {
+                    // language=RegExp
+                    matchingRegex.set(".*\\.internal\\..*")
+                    suppress.set(true)
+                }
+                val moduleMd = project.layout.projectDirectory.file("README.md")
+                if (moduleMd.asFile.exists()) {
+                    includes.from(moduleMd)
+                }
             }
         }