diff --git a/dokka/build.gradle b/dokka/build.gradle
index d1a57dd2a0c..180ed96a0a2 100644
--- a/dokka/build.gradle
+++ b/dokka/build.gradle
@@ -17,7 +17,7 @@ kotlin {
 //        browser()
 //        nodejs()
 //    }
-    android()
+    android {}
 
     sourceSets {
         commonMain {
@@ -30,8 +30,8 @@ kotlin {
                         && it.hasProperty("kotlin")
                         && it.kotlin.sourceSets.any { it.name.contains("commonMain") }
 //                        && it.kotlin.sourceSets.any { it.name.contains("jsMain") }
-//                        && it.kotlin.sourceSets.any { it.name.contains("jvmMain") }
-//                        && it.kotlin.sourceSets.any { it.name.contains("androidMain") }
+                        && it.kotlin.sourceSets.any { it.name.contains("jvmMain") }
+                        && it.kotlin.sourceSets.any { it.name.contains("androidMain") }
                     ) {
                         api it
                     }
@@ -62,7 +62,7 @@ kotlin {
                     if (
                         it != project
                         && it.hasProperty("kotlin")
-//                        && it.kotlin.sourceSets.any { it.name.contains("commonMain") }
+                        && it.kotlin.sourceSets.any { it.name.contains("commonMain") }
                         && it.kotlin.sourceSets.any { it.name.contains("jvmMain") }
                     ) {
                         api it
@@ -78,12 +78,9 @@ kotlin {
                     if (
                         it != project
                         && it.hasProperty("kotlin")
-//                        && it.kotlin.sourceSets.any { it.name.contains("commonMain") }
+                        && it.kotlin.sourceSets.any { it.name.contains("commonMain") }
                         && it.kotlin.sourceSets.any { it.name.contains("androidMain") }
                     ) {
-                        it.kotlin.sourceSets.forEach {
-                            println(it.dependsOn)
-                        }
                         api it
                     }
                 }
@@ -103,7 +100,7 @@ private List<SourceDirectorySet> findSourcesWithName(String... approximateNames)
             }.collect { it.kotlin }
 }
 
-dokkaHtml {
+tasks.dokkaHtml {
     dokkaSourceSets {
         configureEach {
             skipDeprecated.set(true)
@@ -124,11 +121,11 @@ dokkaHtml {
 //        }
 
         named("jvmMain") {
-            sourceRoots.setFrom(findSourcesWithName("jvmMain"))
+            sourceRoots.setFrom(findSourcesWithName("jvmMain", "commonMain"))
         }
 
         named("androidMain") {
-            sourceRoots.setFrom(findSourcesWithName("androidMain"))
+            sourceRoots.setFrom(findSourcesWithName("androidMain", "commonMain"))
         }
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 070cb702f09..ae04661ee73 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists