Update gradle and dokka

amazon-chime-sdk/build.gradle

@@ -2,6 +2,7 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
+import org.jetbrains.dokka.gradle.DokkaTask
 
 apply from: rootProject.file('publishing.gradle')
 apply plugin: 'com.android.library'
@@ -23,8 +24,8 @@ ext.versionMinor = versionProperties.getProperty('versionMinor') as Integer
 ext.versionPatch = versionProperties.getProperty('versionPatch') as Integer
 
 android {
-    compileSdkVersion project.ext.chimeCompileSdkVersion
-    buildToolsVersion project.ext.chimeBuildToolsVersion
+    compileSdk project.ext.chimeCompileSdkVersion
+    buildToolsVersion = project.ext.chimeBuildToolsVersion
 
     defaultConfig {
         minSdkVersion project.ext.chimeMinSdkVersion
@@ -73,27 +74,27 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    dokka {
-        outputFormat = 'html'
-        outputDirectory = "docs"
-
-        configuration {
-            includeNonPublic = false
-            skipDeprecated = true
-            skipEmptyPackages = true
-
-            perPackageOption {
-                prefix = "com.amazonaws.services.chime.sdk.meetings.internal"
-                suppress = true
-            }
-        }
-    }
-
     defaultConfig {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 }
 
+tasks.withType(DokkaTask.class) {
+    dokkaSourceSets.configureEach {
+        documentedVisibilities.set([
+                Visibility.PUBLIC,
+                Visibility.PROTECTED
+        ])
+        skipEmptyPackages.set(true)
+        skipDeprecated.set(true)
+
+        perPackageOption {
+            matchingRegex.set(".*internal.*")
+            suppress.set(true)
+        }
+    }
+}
+
 tasks.withType(Test) {
     jacoco {
         includeNoLocationClasses = true

app/src/main/java/com/amazonaws/services/chime/sdkdemo/fragment/MeetingFragment.kt

@@ -1143,6 +1143,7 @@ class MeetingFragment : Fragment(),
         if (meetingModel.isSharingContent) {
             audioVideo.stopContentShare()
             screenShareManager?.stop(meetingModel.isScreenShareServiceBound)
+            meetingModel.isScreenShareServiceBound = false
         } else {
             startActivityForResult(
                 mediaProjectionManager.createScreenCaptureIntent(),
@@ -1962,6 +1963,7 @@ class MeetingFragment : Fragment(),
         if (meetingModel.isSharingContent && !powerManager.isInteractive) {
             audioVideo.stopContentShare()
             screenShareManager?.stop(meetingModel.isScreenShareServiceBound)
+            meetingModel.isScreenShareServiceBound = false
         }
     }
 

build.gradle

@@ -6,29 +6,32 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.50'
-    ext.dokka_version = '0.10.1'
+    ext.kotlin_version = '1.6.21'
     ext.jacocoVersion = '0.8.8'
 
     repositories {
-        maven { url "https://plugins.gradle.org/m2/" }
+        gradlePluginPortal()
         google()
         mavenCentral()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:7.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.3.1"
         classpath("org.jlleitschuh.gradle:ktlint-gradle:9.1.1")
-        classpath "org.jetbrains.dokka:dokka-gradle-plugin:${dokka_version}"
         classpath 'com.github.jengelman.gradle.plugins:shadow:4.0.2'
     }
 }
 plugins {
     id "io.gitlab.arturbosch.detekt" version "1.3.1"
     id "org.jlleitschuh.gradle.ktlint" version "9.1.1"
+    id 'org.jetbrains.dokka' version '1.9.20'
+}
+
+dokkaHtmlMultiModule {
+    outputDirectory = file("$rootDir/docs")
 }
 
 apply plugin: 'io.gitlab.arturbosch.detekt'

docs/amazon-chime-sdk/com.amazonaws.services.chime.sdk.meetings.analytics/-default-event-analytics-controller/-default-event-analytics-controller.html

@@ -0,0 +1,76 @@
+<!doctype html>
+<html class="no-js">
+<head>
+    <meta name="viewport" content="width=device-width, initial-scale=1" charset="UTF-8">
+    <title>DefaultEventAnalyticsController</title>
+<link href="../../../images/logo-icon.svg" rel="icon" type="image/svg">    <script>var pathToRoot = "../../../";</script>
+    <script>document.documentElement.classList.replace("no-js","js");</script>
+    <script>const storage = localStorage.getItem("dokka-dark-mode")
+    if (storage == null) {
+        const osDarkSchemePreferred = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches
+        if (osDarkSchemePreferred === true) {
+            document.getElementsByTagName("html")[0].classList.add("theme-dark")
+        }
+    } else {
+        const savedDarkMode = JSON.parse(storage)
+        if(savedDarkMode === true) {
+            document.getElementsByTagName("html")[0].classList.add("theme-dark")
+        }
+    }
+    </script>
+<script type="text/javascript" src="https://unpkg.com/kotlin-playground@1/dist/playground.min.js" async></script>
+<script type="text/javascript" src="../../../scripts/sourceset_dependencies.js" async></script>
+<link href="../../../styles/style.css" rel="Stylesheet">
+<link href="../../../styles/main.css" rel="Stylesheet">
+<link href="../../../styles/prism.css" rel="Stylesheet">
+<link href="../../../styles/logo-styles.css" rel="Stylesheet">
+<link href="../../../styles/font-jb-sans-auto.css" rel="Stylesheet">
+<script type="text/javascript" src="../../../scripts/clipboard.js" async></script>
+<script type="text/javascript" src="../../../scripts/navigation-loader.js" async></script>
+<script type="text/javascript" src="../../../scripts/platform-content-handler.js" async></script>
+<script type="text/javascript" src="../../../scripts/main.js" defer></script>
+<script type="text/javascript" src="../../../scripts/prism.js" async></script>
+<script type="text/javascript" src="../../../scripts/symbol-parameters-wrapper_deferred.js" defer></script></head>
+<body>
+    <div class="root">
+<nav class="navigation" id="navigation-wrapper">
+    <div class="navigation--inner">
+        <div class="navigation-title">
+            <button class="menu-toggle" id="menu-toggle" type="button">toggle menu</button>
+            <div class="library-name">
+<a class="library-name--link" href="../../../index.html">
+                            amazon-chime-sdk-android
+                    </a>            </div>
+            <div class="library-version">
+            </div>
+        </div>
+        <div class="filter-section" id="filter-section">
+                <button class="platform-tag platform-selector jvm-like" data-active="" data-filter=":amazon-chime-sdk:dokkaHtmlPartial/release">androidJvm</button>
+        </div>
+    </div>
+    <div class="navigation-controls">
+        <button class="navigation-controls--btn navigation-controls--theme" id="theme-toggle-button" type="button">switch theme</button>
+        <div class="navigation-controls--btn navigation-controls--search" id="searchBar" role="button">search in API</div>
+    </div>
+</nav>
+        <div id="container">
+            <div class="sidebar" id="leftColumn">
+                <div class="sidebar--inner" id="sideMenu"></div>
+            </div>
+            <div id="main">
+<div class="main-content" data-page-type="member" id="content" pageids="amazon-chime-sdk::com.amazonaws.services.chime.sdk.meetings.analytics/DefaultEventAnalyticsController/DefaultEventAnalyticsController/#com.amazonaws.services.chime.sdk.meetings.utils.logger.Logger#com.amazonaws.services.chime.sdk.meetings.session.MeetingSessionConfiguration#com.amazonaws.services.chime.sdk.meetings.analytics.MeetingStatsCollector#com.amazonaws.services.chime.sdk.meetings.ingestion.EventReporter?/PointingToDeclaration//533364019">
+  <div class="breadcrumbs"><a href="../../index.html">amazon-chime-sdk</a><span class="delimiter">/</span><a href="../index.html">com.amazonaws.services.chime.sdk.meetings.analytics</a><span class="delimiter">/</span><a href="index.html">DefaultEventAnalyticsController</a><span class="delimiter">/</span><span class="current">DefaultEventAnalyticsController</span></div>
+  <div class="cover ">
+    <h1 class="cover"><span>Default</span><wbr><span>Event</span><wbr><span>Analytics</span><wbr><span><span>Controller</span></span></h1>
+  </div>
+  <div class="platform-hinted " data-platform-hinted="data-platform-hinted"><div class="content sourceset-dependent-content" data-active="" data-togglable=":amazon-chime-sdk:dokkaHtmlPartial/release"><div class="symbol monospace"><span class="token keyword">constructor</span><span class="token punctuation">(</span><span class="parameters "><span class="parameter ">logger<span class="token operator">: </span><a href="../../com.amazonaws.services.chime.sdk.meetings.utils.logger/-logger/index.html">Logger</a><span class="token punctuation">, </span></span><span class="parameter ">meetingSessionConfiguration<span class="token operator">: </span><a href="../../com.amazonaws.services.chime.sdk.meetings.session/-meeting-session-configuration/index.html">MeetingSessionConfiguration</a><span class="token punctuation">, </span></span><span class="parameter ">meetingStatsCollector<span class="token operator">: </span><a href="../-meeting-stats-collector/index.html">MeetingStatsCollector</a><span class="token punctuation">, </span></span><span class="parameter ">eventReporter<span class="token operator">: </span><a href="../../com.amazonaws.services.chime.sdk.meetings.ingestion/-event-reporter/index.html">EventReporter</a><span class="token operator">?</span><span class="token operator"> = </span>null</span></span><span class="token punctuation">)</span></div></div></div>
+</div>
+      <div class="footer">
+        <span class="go-to-top-icon"><a href="#content" id="go-to-top-link"></a></span><span>© 2024 Copyright</span><span class="pull-right"><span>Generated by </span><a href="https://github.com/Kotlin/dokka"><span>dokka</span><span class="padded-icon"></span></a></span>
+      </div>
+            </div>
+        </div>
+    </div>
+</body>
+</html>
+