diff --git a/.github/workflows/android-pull-request-ci.yml b/.github/workflows/android-pull-request-ci.yml
index 9aacf95..66cbaef 100644
--- a/.github/workflows/android-pull-request-ci.yml
+++ b/.github/workflows/android-pull-request-ci.yml
@@ -2,7 +2,7 @@ name: Android Pull Request CI
on:
pull_request:
- branches: [ main ]
+ branches: [ develop ]
jobs:
verify:
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 16795f2..f21cd3e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -26,4 +26,6 @@ android {
dependencies {
implementation(projects.core.navigation)
+ implementation(projects.core.designsystem)
+ implementation(libs.androidx.appcompat)
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4993a6b..4c5c2e8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,11 @@
+
+
+
+ tools:targetApi="34">
+
+
+
+
+
-
\ No newline at end of file
+
+
+
+
+
diff --git a/app/src/main/kotlin/org/cazait/cazaitandroid/ui/MainActivity.kt b/app/src/main/kotlin/org/cazait/cazaitandroid/ui/MainActivity.kt
new file mode 100644
index 0000000..96ecd87
--- /dev/null
+++ b/app/src/main/kotlin/org/cazait/cazaitandroid/ui/MainActivity.kt
@@ -0,0 +1,24 @@
+package org.cazait.cazaitandroid.ui
+
+import android.os.Bundle
+import androidx.activity.compose.setContent
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import dagger.hilt.android.AndroidEntryPoint
+import org.cazait.cazaitandroid.core.designsystem.theme.CazaitTheme
+
+@AndroidEntryPoint
+class MainActivity: AppCompatActivity() {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+
+ setContent {
+ CazaitTheme {
+ Surface {
+ Text(text = "hello cazait")
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index 426f339..0000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
deleted file mode 100644
index 6b99b68..0000000
--- a/app/src/main/res/values/themes.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/build-logic/src/main/kotlin/cazait.android.application.gradle.kts b/build-logic/src/main/kotlin/cazait.android.application.gradle.kts
index 5c8513d..5949525 100644
--- a/build-logic/src/main/kotlin/cazait.android.application.gradle.kts
+++ b/build-logic/src/main/kotlin/cazait.android.application.gradle.kts
@@ -1,11 +1,25 @@
+import gradle.kotlin.dsl.accessors._9885c8525475a2a77e0b650bdf1e3c81.androidTestImplementation
+import gradle.kotlin.dsl.accessors._9885c8525475a2a77e0b650bdf1e3c81.implementation
import org.cazait.cazaitandroid.configureHiltAndroid
import org.cazait.cazaitandroid.configureKotestAndroid
import org.cazait.cazaitandroid.configureKotlinAndroid
+import org.cazait.cazaitandroid.libs
plugins {
id("com.android.application")
+ id("cazait.android.compose")
}
configureKotlinAndroid()
configureHiltAndroid()
configureKotestAndroid()
+
+dependencies {
+ val libs = project.extensions.libs
+ implementation(libs.findLibrary("hilt.navigation.compose").get())
+ implementation(libs.findLibrary("androidx.compose.navigation").get())
+ androidTestImplementation(libs.findLibrary("androidx.compose.navigation.test").get())
+
+ implementation(libs.findLibrary("androidx.lifecycle.viewModelCompose").get())
+ implementation(libs.findLibrary("androidx.lifecycle.runtimeCompose").get())
+}
diff --git a/build-logic/src/main/kotlin/org/cazait/cazaitandroid/KotlinAndroid.kt b/build-logic/src/main/kotlin/org/cazait/cazaitandroid/KotlinAndroid.kt
index 764519e..1df4e15 100644
--- a/build-logic/src/main/kotlin/org/cazait/cazaitandroid/KotlinAndroid.kt
+++ b/build-logic/src/main/kotlin/org/cazait/cazaitandroid/KotlinAndroid.kt
@@ -18,10 +18,10 @@ internal fun Project.configureKotlinAndroid() {
// Android settings
androidExtension.apply {
- compileSdk = 33
+ compileSdk = 34
defaultConfig {
- minSdk = 24
+ minSdk = 28
}
compileOptions {
diff --git a/core/data/src/main/AndroidManifest.xml b/core/data/src/main/AndroidManifest.xml
index a5918e6..44008a4 100644
--- a/core/data/src/main/AndroidManifest.xml
+++ b/core/data/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/core/designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts
index b2e4c7a..0636e1d 100644
--- a/core/designsystem/build.gradle.kts
+++ b/core/designsystem/build.gradle.kts
@@ -9,7 +9,7 @@ android {
dependencies {
implementation(libs.androidx.appcompat)
-
+
implementation(libs.landscapist.bom)
implementation(libs.landscapist.coil)
implementation(libs.landscapist.placeholder)
diff --git a/core/designsystem/src/main/kotlin/org/cazait/cazaitandroid/core/designsystem/theme/Theme.kt b/core/designsystem/src/main/kotlin/org/cazait/cazaitandroid/core/designsystem/theme/Theme.kt
index eb7775f..cb710f5 100644
--- a/core/designsystem/src/main/kotlin/org/cazait/cazaitandroid/core/designsystem/theme/Theme.kt
+++ b/core/designsystem/src/main/kotlin/org/cazait/cazaitandroid/core/designsystem/theme/Theme.kt
@@ -13,9 +13,6 @@ import androidx.compose.runtime.compositionLocalOf
import androidx.compose.ui.platform.LocalInspectionMode
import androidx.compose.ui.platform.LocalView
import androidx.core.view.WindowCompat
-import androidx.glance.GlanceTheme
-import androidx.glance.color.ColorProvider
-import androidx.glance.color.colorProviders
private val DarkColorScheme = darkColorScheme(
primary = White,
diff --git a/core/designsystem/src/main/res/values/themes.xml b/core/designsystem/src/main/res/values/themes.xml
new file mode 100644
index 0000000..9a2b86c
--- /dev/null
+++ b/core/designsystem/src/main/res/values/themes.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
diff --git a/core/navigation/src/main/AndroidManifest.xml b/core/navigation/src/main/AndroidManifest.xml
index a5918e6..44008a4 100644
--- a/core/navigation/src/main/AndroidManifest.xml
+++ b/core/navigation/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 53be254..176ad90 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,47 +1,47 @@
[versions]
androidGradlePlugin = "8.2.0"
-androidDesugarJdkLibs = "1.2.2"
-androidxCore = "1.9.0"
+androidDesugarJdkLibs = "2.0.4"
+androidxCore = "1.12.0"
androidxAppCompat = "1.6.1"
-androidxLifecycle = "2.6.1"
-androidxComposeBom = "2023.05.01"
-androidxComposeCompiler = "1.4.7"
-androidxComposeNavigation = "2.6.0"
-androidxComposeMaterial3 = "1.1.0"
-androidxActivity = "1.7.2"
-hilt = "2.46.1"
-hiltNavigationCompose = "1.0.0"
-
-okhttp = "4.11.0"
+androidxLifecycle = "2.6.2"
+androidxComposeBom = "2023.10.01"
+androidxComposeCompiler = "1.5.7"
+androidxComposeNavigation = "2.7.6"
+androidxComposeMaterial3 = "1.1.2"
+androidxActivity = "1.8.2"
+hilt = "2.49"
+hiltNavigationCompose = "1.1.0"
+
+okhttp = "4.12.0"
retrofit = "2.9.0"
retrofitKotlinxSerializationJson = "1.0.0"
-kotlinxSerializationJson = "1.5.1"
+kotlinxSerializationJson = "1.6.1"
kotlinxDatetime = "0.2.1"
-kotlinxImmutable = "0.3.5"
+kotlinxImmutable = "0.3.6"
landscapist = "2.2.5"
composeShimmer = "1.0.5"
junit4 = "4.13.2"
junitVintageEngine = "5.10.0"
-kotlin = "1.8.21"
+kotlin = "1.9.21"
-androidxTestExt = "1.1.4"
-androidxEspresso = "3.5.0"
+androidxTestExt = "1.1.5"
+androidxEspresso = "3.5.1"
kotest = "5.6.2"
# https://github.com/detekt/detekt
detekt = "1.23.0"
mockk = "1.13.5"
turbine = "1.0.0"
-coroutine = "1.7.2"
+coroutine = "1.7.3"
androidxDatastore = "1.0.0"
ossLicenses = "17.0.1"
ossLicensesPlugin = "0.10.6"
-androidxGlance = "1.0.0-beta01"
+androidxGlance = "1.0.0"
glanceExperimentalTools = "0.2.2"
[libraries]