From 1eed60df98df5f26fc8fb9c7c07a65af22fbda66 Mon Sep 17 00:00:00 2001
From: upon0426 <karasawa.yui@gmail.com>
Date: Fri, 2 Jun 2023 20:15:25 +0900
Subject: [PATCH] Revert "made contributor directory"

This reverts commit 0911eaacdb9339be2420ecd558c21708bad10db2.
---
 .../java/io/github/droidkaigi/confsched2023/MainActivity.kt    | 1 -
 .../confsched2023/{contributors => }/Contributors.kt           | 2 +-
 .../confsched2023/{contributors => }/ContributorsScreen.kt     | 3 +--
 3 files changed, 2 insertions(+), 4 deletions(-)
 rename feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/{contributors => }/Contributors.kt (52%)
 rename feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/{contributors => }/ContributorsScreen.kt (61%)

diff --git a/app-android/src/main/java/io/github/droidkaigi/confsched2023/MainActivity.kt b/app-android/src/main/java/io/github/droidkaigi/confsched2023/MainActivity.kt
index eb2fe1c37..9c8115fad 100644
--- a/app-android/src/main/java/io/github/droidkaigi/confsched2023/MainActivity.kt
+++ b/app-android/src/main/java/io/github/droidkaigi/confsched2023/MainActivity.kt
@@ -11,7 +11,6 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import dagger.hilt.android.AndroidEntryPoint
-import io.github.droidkaigi.confsched2023.contributors.ContributorsScreen
 import io.github.droidkaigi.confsched2023.designsystem.theme.KaigiTheme
 import io.github.droidkaigi.confsched2023.sessions.TimetableScreen
 
diff --git a/feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/contributors/Contributors.kt b/feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/Contributors.kt
similarity index 52%
rename from feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/contributors/Contributors.kt
rename to feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/Contributors.kt
index 40ca9474a..7a1f47400 100644
--- a/feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/contributors/Contributors.kt
+++ b/feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/Contributors.kt
@@ -1,4 +1,4 @@
-package io.github.droidkaigi.confsched2023.contributors
+package io.github.droidkaigi.confsched2023
 
 class Contributors {
     fun greet(): String = "test test"
diff --git a/feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/contributors/ContributorsScreen.kt b/feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/ContributorsScreen.kt
similarity index 61%
rename from feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/contributors/ContributorsScreen.kt
rename to feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/ContributorsScreen.kt
index 7091f235a..21c5bac6a 100644
--- a/feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/contributors/ContributorsScreen.kt
+++ b/feature/contributors/src/commonMain/kotlin/io/github/droidkaigi/confsched2023/ContributorsScreen.kt
@@ -1,8 +1,7 @@
-package io.github.droidkaigi.confsched2023.contributors
+package io.github.droidkaigi.confsched2023
 
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import io.github.droidkaigi.confsched2023.contributors.Contributors
 
 @Composable
 fun ContributorsScreen() {