Merge pull request google#246 from google/cb/dokka-1.4.30

Upgrade to Dokka 1.4.30
balao7 · Mar 16, 2021 · e5521e4 · e5521e4
2 parents 255b9dd + cb6410a
commit e5521e4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 18 deletions.
diff --git a/build.gradle b/build.gradle
@@ -124,7 +124,10 @@ subprojects {
 
                 // Add Android SDK packages
                 noAndroidSdkLink.set(false)
-
+                // Separate inherited members
+                separateInheritedMembers.set(true)
+                // Suppress obvious functions (toString, etc)
+                suppressObviousFunctions.set(true)
                 // Add samples from :sample module
                 samples.from(rootProject.file("sample/src/main/java/"))
 

diff --git a/buildSrc/src/main/java/com/google/accompanist/buildsrc/dependencies.kt b/buildSrc/src/main/java/com/google/accompanist/buildsrc/dependencies.kt
@@ -36,7 +36,7 @@ object Libs {
     }
 
     object Dokka {
-        private const val version = "1.4.20"
+        private const val version = "1.4.30"
         const val gradlePlugin = "org.jetbrains.dokka:dokka-gradle-plugin:$version"
     }
 

diff --git a/generate_docs.sh b/generate_docs.sh
@@ -34,14 +34,6 @@ sed -i.bak 's/$dokka.linkExtension:md/$dokka.linkExtension:html/g' package-list-
 # Build the docs with dokka
 ./gradlew clean dokkaHtmlMultiModule
 
-# Dokka doesn't currently allow us to change the index page name so move it manually
-mv docs/api/-modules.html docs/api/index.html
-
-# Re-word the Dokka call out
-find docs/api/ -type f -name '*.html' -exec sed -i -e 's/Sponsored and developed/Documentation generated/g' {} \;
-# Remove the copyright declaration
-find docs/api/ -type f -name '*.html' -exec sed -i -e 's/© [0-9]* Copyright//' {} \;
-
 # Clean up the temp Coil package list
 rm package-list-coil-base
 

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -16,27 +16,27 @@ nav:
   - 'Overview': index.md
   - 'Coil':
     - 'Guide': coil.md
-    - 'API': api/coil/coil/
+    - 'API': api/coil/
   - 'Glide':
     - 'Guide': glide.md
-    - 'API': api/glide/glide/
+    - 'API': api/glide/
   - 'Image Loading Core':
-    - 'API': api/imageloading-core/imageloading-core
+    - 'API': api/imageloading-core/
   - 'Picasso':
     - 'Guide': picasso.md
-    - 'API': api/picasso/picasso/
+    - 'API': api/picasso/
   - 'Insets':
     - 'Guide': insets.md
-    - 'API': api/insets/insets/
+    - 'API': api/insets/
   - 'AppCompat Theme':
     - 'Guide': appcompat-theme.md
-    - 'API': api/appcompat-theme/appcompat-theme
+    - 'API': api/appcompat-theme/
   - 'Pager layouts':
     - 'Guide': pager.md
-    - 'API': api/pager/pager
+    - 'API': api/pager/
   - 'Flow layouts':
     - 'Guide': flowlayout.md
-    - 'API': api/flowlayout/flowlayout
+    - 'API': api/flowlayout/
   - 'Snapshots': using-snapshot-version.md
   - 'Contributing': contributing.md
   - 'Maintainers':