diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 8fcf0b83f..ae0301c43 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -51,7 +51,6 @@ jobs: GOOGLE_SERVICES: op://development/google services/playground release/base64 - run: | - echo $GOOGLE_SERVICES | base64 --decode > app-launcher/android/google-services.json echo $GOOGLE_SERVICES | base64 --decode > conferences-app/google-services.json env: GOOGLE_SERVICES: ${{ steps.op-secrets.outputs.GOOGLE_SERVICES }} diff --git a/app-launcher/android/build.gradle.kts b/app-launcher/android/build.gradle.kts deleted file mode 100644 index 73941d108..000000000 --- a/app-launcher/android/build.gradle.kts +++ /dev/null @@ -1,57 +0,0 @@ -plugins { - id("com.android.application") - id("com.google.gms.google-services") - id("io.ashdavies.android") - id("io.ashdavies.compose") - id("io.ashdavies.kotlin") - id("io.ashdavies.properties") - - alias(libs.plugins.build.config) -} - -android { - val androidTest by sourceSets.getting { - res.srcDirs("src/androidMain/res") - } - - defaultConfig { - versionName = "1.0" - versionCode = 1 - } - - namespace = "io.ashdavies.playground" -} - -buildConfig { - val androidApiKey by stringProperty(::buildConfigField) - val androidStrictMode by booleanProperty(::buildConfigField) - - packageName.set(android.namespace) -} - -kotlin { - sourceSets { - androidMain.dependencies { - implementation(projects.appLauncher.common) - - implementation(projects.httpClient) - implementation(projects.platformScaffold) - implementation(projects.platformSupport) - - implementation(libs.androidx.activity.compose) - implementation(libs.androidx.core.splashscreen) - implementation(libs.google.android.material) - implementation(libs.ktor.client.core) - implementation(libs.slack.circuit.foundation) - implementation(libs.slack.circuit.overlay) - implementation(libs.squareup.okio) - } - - val androidInstrumentedTest by getting { - dependencies { - implementation(libs.androidx.core.splashscreen) - implementation(libs.google.android.material) - } - } - } -} diff --git a/app-launcher/android/gradle.properties b/app-launcher/android/gradle.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/app-launcher/android/src/androidMain/AndroidManifest.xml b/app-launcher/android/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 677a78d83..000000000 --- a/app-launcher/android/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app-launcher/android/src/androidMain/ic_launcher-web.png b/app-launcher/android/src/androidMain/ic_launcher-web.png deleted file mode 100644 index b04b8d292..000000000 Binary files a/app-launcher/android/src/androidMain/ic_launcher-web.png and /dev/null differ diff --git a/app-launcher/common/build.gradle.kts b/app-launcher/common/build.gradle.kts deleted file mode 100644 index 2ac1850ac..000000000 --- a/app-launcher/common/build.gradle.kts +++ /dev/null @@ -1,64 +0,0 @@ -plugins { - id("io.ashdavies.compose") - id("io.ashdavies.default") - id("io.ashdavies.parcelable") - - alias(libs.plugins.cash.sqldelight) -} - -android { - namespace = "io.ashdavies.common" -} - -kotlin { - sourceSets { - all { - languageSettings.optIn("org.jetbrains.compose.resources.ExperimentalResourceApi") - } - - commonMain.dependencies { - implementation(projects.analytics) - implementation(projects.appCheck.appCheckClient) - implementation(projects.composeMaterial) - implementation(projects.httpClient) - implementation(projects.identityManager) - implementation(projects.mapRoutes) - implementation(projects.platformScaffold) - implementation(projects.platformSupport) - implementation(projects.sqlCompose) - implementation(projects.sqlDriver) - - implementation(compose.components.resources) - implementation(compose.material3) - implementation(compose.ui) - - implementation(libs.coil.compose) - implementation(libs.coil.network) - implementation(libs.slack.circuit.foundation) - } - - androidMain.dependencies { - implementation(libs.androidx.activity.compose) - } - - jvmMain.dependencies { - implementation(compose.desktop.currentOs) - } - - jvmTest.dependencies { - implementation(kotlin("test")) - - implementation(libs.app.cash.turbine) - implementation(libs.kotlinx.coroutines.test) - implementation(libs.slack.circuit.test) - } - } -} - -sqldelight { - databases { - create("PlaygroundDatabase") { - packageName.set(android.namespace) - } - } -} diff --git a/app-launcher/common/src/androidMain/AndroidManifest.xml b/app-launcher/common/src/androidMain/AndroidManifest.xml deleted file mode 100644 index 8072ee00d..000000000 --- a/app-launcher/common/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/app-launcher/desktop/build.gradle.kts b/app-launcher/desktop/build.gradle.kts deleted file mode 100644 index 0db3efd36..000000000 --- a/app-launcher/desktop/build.gradle.kts +++ /dev/null @@ -1,59 +0,0 @@ -import org.jetbrains.compose.desktop.application.dsl.TargetFormat - -plugins { - id("io.ashdavies.compose") - id("io.ashdavies.kotlin") - id("io.ashdavies.properties") - - alias(libs.plugins.build.config) -} - -buildConfig { - val browserApiKey by stringProperty(::buildConfigField) - - packageName.set("io.ashdavies.playground") -} - -kotlin { - jvm() - - sourceSets { - commonMain.dependencies { - implementation(projects.appLauncher.common) - implementation(projects.httpClient) - implementation(projects.keyNavigation) - implementation(projects.platformSupport) - - implementation(libs.ajalt.clikt) - implementation(libs.ktor.client.core) - implementation(libs.slack.circuit.foundation) - } - - jvmMain.dependencies { - runtimeOnly(compose.desktop.currentOs) - runtimeOnly(libs.kotlinx.coroutines.swing) - runtimeOnly(libs.slf4j.simple) - } - } -} - -compose.desktop { - application { - // https://github.com/Kotlin/kotlinx.coroutines/issues/3914 - jvmArgs("-Dkotlinx.coroutines.fast.service.loader=false") - - mainClass = "io.ashdavies.playground.LauncherMainKt" - - nativeDistributions { - targetFormats(TargetFormat.Deb, TargetFormat.Dmg, TargetFormat.Msi) - - packageName = "LauncherApp" - packageVersion = "1.0.0" - - windows { - upgradeUuid = "EFED2B83-8786-4096-B5B7-0366F8B691F5" - menu = true - } - } - } -}