Skip to content

Commit

Permalink
Import kotlin-gb project module (#409)
Browse files Browse the repository at this point in the history
Co-authored-by: Davies Ashley <[email protected]>
  • Loading branch information
ashdavies and ashdavies authored Jul 26, 2023
1 parent 7e437b9 commit 126a93f
Show file tree
Hide file tree
Showing 14 changed files with 42 additions and 8 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ https://firebase.google.com/docs/app-check/custom-provider
![JVM](https://img.shields.io/badge/project-jvm-component.svg?colorA=555555&colorB=7F52FF&label=&logo=kotlin&logoColor=ffffff&logoWidth=10)

### Kotlin GB [kotlin-gb]
![Planned](https://img.shields.io/badge/project-planned-status.svg?colorA=555555&colorB=blue&label=&logo=kotlin&logoColor=ffffff&logoWidth=10)
![Experimental](https://img.shields.io/badge/project-experimental-status.svg?colorA=555555&colorB=red&label=&logo=kotlin&logoColor=ffffff&logoWidth=10)
![Multiplatform](https://img.shields.io/badge/project-multiplatform-component.svg?colorA=555555&colorB=7F52FF&label=&logo=kotlin&logoColor=ffffff&logoWidth=10)
Offers a set of Traditional English aliases for Simplified English Kotlin APIs, largely a parody, thus does not comply to the same level of modularisation.

### Local Storage [local-storage]
![Experimental](https://img.shields.io/badge/project-experimental-status.svg?colorA=555555&colorB=red&label=&logo=kotlin&logoColor=ffffff&logoWidth=10)
Expand Down
2 changes: 1 addition & 1 deletion app-launcher/common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ kotlin {
implementation(ratingsApp)
}

implementation(libs.arkivanov.parcelable)
implementation(libs.essenty.parcelable)
implementation(libs.slack.circuit.foundation)
}

Expand Down
2 changes: 1 addition & 1 deletion dominion-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ kotlin {
implementation(projects.httpClient)
implementation(projects.imageLoader)

implementation(libs.arkivanov.parcelable)
implementation(libs.essenty.parcelable)

with(libs.ktor.client) {
implementation(libs.ktor.client.content.negotiation)
Expand Down
2 changes: 1 addition & 1 deletion events-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ kotlin {
implementation(localStorage)
}

implementation(libs.arkivanov.parcelable)
implementation(libs.essenty.parcelable)

with(libs.ktor.client) {
implementation(content.negotiation)
Expand Down
2 changes: 1 addition & 1 deletion gallery-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ kotlin {
implementation(projects.imageLoader)
implementation(projects.localStorage)

implementation(libs.arkivanov.parcelable)
implementation(libs.essenty.parcelable)
implementation(libs.slack.circuit.foundation)
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ apollo-graphql-coroutines-support = { module = "com.apollographql.apollo:apollo-
apollo-graphql-runtime = { module = "com.apollographql.apollo:apollo-runtime", version.ref = "apollo-graphql" }

app-cash-turbine = "app.cash.turbine:turbine:1.0.0"
arkivanov-parcelable = "com.arkivanov.essenty:parcelable:1.1.0"

auth-java-jwt = "com.auth0:java-jwt:4.4.0"
auth-jwks-rsa = "com.auth0:jwks-rsa:0.22.0"

coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil-kt" }
coil-core = { module = "io.coil-kt:coil", version.ref = "coil-kt" }

essenty-parcelable = "com.arkivanov.essenty:parcelable:1.1.0"
fusesource-jansi = "org.fusesource.jansi:jansi:2.4.0"

google-accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "google-accompanist" }
Expand Down
14 changes: 14 additions & 0 deletions kotlin-gb/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
plugins {
id("io.ashdavies.default")
}

android {
namespace = "io.ashdavies.locale"
}

kotlin {
commonMain.dependencies {
implementation(libs.essenty.parcelable)
implementation(libs.ktor.http)
}
}
2 changes: 2 additions & 0 deletions kotlin-gb/src/androidMain/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest />
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package io.ashdavies.locale

public typealias Serialisable = kotlinx.serialization.Serializable

@kotlinx.serialization.ExperimentalSerializationApi
public typealias Serialiser = kotlinx.serialization.Serializer
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package io.ashdavies.locale

import io.ktor.http.HttpHeaders

public val HttpHeaders.Authorisation: String
get() = Authorization
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package io.ashdavies.locale

public typealias Parcelise = com.arkivanov.essenty.parcelable.Parcelize
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ import kotlinx.serialization.Serializer
/**
* TODO: Move to events domain
*/
@OptIn(ExperimentalSerializationApi::class)
@ExperimentalSerializationApi
@Serializer(forClass = Event::class)
public object EventsSerializer
2 changes: 1 addition & 1 deletion ratings-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ kotlin {
implementation(notionClient)
}

implementation(libs.arkivanov.parcelable)
implementation(libs.essenty.parcelable)
implementation(libs.ktor.client.core)
implementation(libs.slack.circuit.foundation)
}
Expand Down
1 change: 1 addition & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ include(
":google-cloud",
":http-client",
":image-loader",
":kotlin-gb",
":local-storage",
":micro-yaml",
":notion-client",
Expand Down

0 comments on commit 126a93f

Please sign in to comment.