(General) Organize imports

maxkeppeler · maxkeppeler · commit 523db734d09f · 2022-11-06T22:27:52.000+01:00
diff --git a/app/src/main/java/com/mk/sheets/compose/main/NavHost.kt b/app/src/main/java/com/mk/sheets/compose/main/NavHost.kt
@@ -27,9 +27,9 @@ import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
-import com.mk.sheets.compose.ShowcasePopupScreen
-import com.mk.sheets.compose.ShowcaseDialogSamplesScreen
 import com.mk.sheets.compose.ShowcaseBottomSheetScreen
+import com.mk.sheets.compose.ShowcaseDialogSamplesScreen
+import com.mk.sheets.compose.ShowcasePopupScreen
 import com.mk.sheets.compose.models.Screen
 
 @ExperimentalFoundationApi
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -119,7 +119,7 @@ fun com.android.build.gradle.BaseExtension.baselibraryConfig() {
         kotlinOptions {
             jvmTarget = "1.8"
             freeCompilerArgs = freeCompilerArgs + listOf(
-                "-Xopt-in=androidx.compose.material.ExperimentalMaterialApi",
+                "-Xopt-in=androidx.compose.material.ExperimentalMaterial3Api",
                 "-Xopt-in=androidx.compose.animation.ExperimentalAnimationApi",
                 "-Xopt-in=androidx.compose.ui.test.ExperimentalTestApi",
                 "-Xopt-in=androidx.compose.foundation.ExperimentalFoundationApi",
diff --git a/info/src/androidTest/java/com/maxkeppeler/sheets/info/functional/InfoViewTests.kt b/info/src/androidTest/java/com/maxkeppeler/sheets/info/functional/InfoViewTests.kt
@@ -13,11 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-@file:OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
+@file:OptIn(ExperimentalMaterial3Api::class)
 
 package com.maxkeppeler.sheets.info.functional
 
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.assertTextEquals
diff --git a/input/src/androidTest/java/com/maxkeppeler/sheets/input/functional/InputViewInputCheckboxGroupTestsCustom.kt b/input/src/androidTest/java/com/maxkeppeler/sheets/input/functional/InputViewInputCheckboxGroupTestsCustom.kt
@@ -13,11 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-@file:OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
+@file:OptIn(ExperimentalMaterial3Api::class)
 
 package com.maxkeppeler.sheets.input.functional
 
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Face
 import androidx.compose.material3.ExperimentalMaterial3Api
diff --git a/input/src/androidTest/java/com/maxkeppeler/sheets/input/functional/InputViewInputCheckboxTests.kt b/input/src/androidTest/java/com/maxkeppeler/sheets/input/functional/InputViewInputCheckboxTests.kt
@@ -13,11 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-@file:OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
+@file:OptIn(ExperimentalMaterial3Api::class)
 
 package com.maxkeppeler.sheets.input.functional
 
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Face
 import androidx.compose.material3.ExperimentalMaterial3Api
diff --git a/input/src/androidTest/java/com/maxkeppeler/sheets/input/functional/InputViewInputCustomViewTests.kt b/input/src/androidTest/java/com/maxkeppeler/sheets/input/functional/InputViewInputCustomViewTests.kt
@@ -13,14 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-@file:OptIn(
-    ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class,
-    ExperimentalMaterialApi::class
-)
+@file:OptIn(ExperimentalMaterial3Api::class)
 
 package com.maxkeppeler.sheets.input.functional
 
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Face
 import androidx.compose.material3.ExperimentalMaterial3Api
diff --git a/input/src/androidTest/java/com/maxkeppeler/sheets/input/functional/InputViewInputDividerTests.kt b/input/src/androidTest/java/com/maxkeppeler/sheets/input/functional/InputViewInputDividerTests.kt
@@ -13,11 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-@file:OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
+@file:OptIn(ExperimentalMaterial3Api::class)
 
 package com.maxkeppeler.sheets.input.functional
 
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
diff --git a/input/src/androidTest/java/com/maxkeppeler/sheets/input/functional/InputViewInputRadioButtonGroupTests.kt b/input/src/androidTest/java/com/maxkeppeler/sheets/input/functional/InputViewInputRadioButtonGroupTests.kt
@@ -13,11 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-@file:OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
+@file:OptIn(ExperimentalMaterial3Api::class)
 
 package com.maxkeppeler.sheets.input.functional
 
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Face
 import androidx.compose.material3.ExperimentalMaterial3Api
diff --git a/input/src/androidTest/java/com/maxkeppeler/sheets/input/functional/InputViewInputTextFieldTests.kt b/input/src/androidTest/java/com/maxkeppeler/sheets/input/functional/InputViewInputTextFieldTests.kt
@@ -13,11 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-@file:OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
+@file:OptIn(ExperimentalMaterial3Api::class)
 
 package com.maxkeppeler.sheets.input.functional
 
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Face
 import androidx.compose.material3.ExperimentalMaterial3Api
diff --git a/input/src/androidTest/java/com/maxkeppeler/sheets/input/functional/InputViewInputTextTests.kt b/input/src/androidTest/java/com/maxkeppeler/sheets/input/functional/InputViewInputTextTests.kt
@@ -13,14 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-@file:OptIn(
-    ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class,
-    ExperimentalMaterialApi::class
-)
+@file:OptIn(ExperimentalMaterial3Api::class)
 
 package com.maxkeppeler.sheets.input.functional
 
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Face
 import androidx.compose.material3.ExperimentalMaterial3Api
diff --git a/input/src/androidTest/java/com/maxkeppeler/sheets/input/functional/InputViewTests.kt b/input/src/androidTest/java/com/maxkeppeler/sheets/input/functional/InputViewTests.kt
@@ -13,12 +13,11 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-@file:OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
+@file:OptIn(ExperimentalMaterial3Api::class)
 
 package com.maxkeppeler.sheets.input.functional
 
 import android.os.Bundle
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.performClick
diff --git a/list/src/androidTest/java/com/maxkeppeler/sheets/list/functional/ListViewTests.kt b/list/src/androidTest/java/com/maxkeppeler/sheets/list/functional/ListViewTests.kt
@@ -13,11 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-@file:OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
+@file:OptIn(ExperimentalMaterial3Api::class)
 
 package com.maxkeppeler.sheets.list.functional
 
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.performClick
diff --git a/option/src/androidTest/java/com/maxkeppeler/sheets/option/functional/OptionViewTests.kt b/option/src/androidTest/java/com/maxkeppeler/sheets/option/functional/OptionViewTests.kt
@@ -13,11 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-@file:OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
+@file:OptIn(ExperimentalMaterial3Api::class)
 
 package com.maxkeppeler.sheets.option.functional
 
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.performClick
diff --git a/state/src/androidTest/java/com/maxkeppeler/sheets/state/StateViewTests.kt b/state/src/androidTest/java/com/maxkeppeler/sheets/state/StateViewTests.kt
@@ -13,11 +13,10 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-@file:OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
+@file:OptIn(ExperimentalMaterial3Api::class)
 
 package com.maxkeppeler.sheets.state
 
-import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.assertTextContains
