Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add libs.versions.toml #37

Merged
merged 10 commits into from
Jul 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,13 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: set up JDK 11
uses: actions/setup-java@v1
uses: actions/setup-java@v4
with:
distribution: zulu
java-version: 11
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/web-build-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- run: './gradlew :web:app:jsBrowserProductionWebpack --stacktrace'
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
Expand Down
28 changes: 13 additions & 15 deletions android/app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import org.jetbrains.compose.compose

plugins {
`android-application`
kotlin("android")
id("org.jetbrains.compose")
id("com.google.gms.google-services") apply false
id("android-application")
alias(libs.plugins.kotlin.android)
alias(libs.plugins.jetbrains.compose)
alias(libs.plugins.google.services)
}

dependencies {
Expand All @@ -15,22 +13,22 @@ dependencies {
implementation(project(":shared:features:search"))
implementation(project(":shared:features:myidols"))

implementation(Libraries.Coroutines.android)
implementation(libs.kotlinx.coroutines.android)

implementation(Libraries.Jetpack.core)
implementation(Libraries.Jetpack.activity)
implementation(Libraries.Jetpack.activityCompose)
implementation(Libraries.Jetpack.material)
implementation(libs.androidx.core)
implementation(libs.androidx.activity.ktx)
implementation(libs.androidx.activity.compose)
implementation(libs.android.material)
implementation(compose.ui)
implementation(compose.material)
implementation(compose.uiTooling)
implementation(compose(Libraries.Compose.util))
implementation(Libraries.Jetpack.Lifecycle.viewModel)
implementation(libs.compose.util)
implementation(libs.androidx.lifecycle.viewmodel)

implementation(Libraries.Koin.android)
implementation(libs.koin.android)

// Workaround
implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.4")
}

apply(plugin = "com.google.gms.google-services")
//apply(plugin = "com.google.gms.google-services")
37 changes: 11 additions & 26 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,28 +1,13 @@
plugins {
`node-convensions`
`ci-report-all-tests`
}

buildscript {
repositories {
google()
mavenCentral()
}

dependencies {
classpath(kotlinGradlePlugin)
classpath(androidGradlePlugin)
classpath(googleServicesPlugin)
}
}

allprojects {
repositories {
google()
mavenCentral()
maven(url = "https://s01.oss.sonatype.org/content/repositories/releases")
maven(url = "https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
maven(url = "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers")
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
}
alias(libs.plugins.kotlin.mpp) apply false
alias(libs.plugins.jetbrains.compose) apply false
alias(libs.plugins.kotlinx.serialization) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.google.services) apply false
alias(libs.plugins.kotlin.js) apply false
alias(libs.plugins.kotest) apply false
id("node-convensions")
id("ci-report-all-tests")
}
23 changes: 0 additions & 23 deletions buildSrc/build.gradle.kts

This file was deleted.

13 changes: 0 additions & 13 deletions buildSrc/src/main/kotlin/Kotlin.kt

This file was deleted.

126 changes: 0 additions & 126 deletions buildSrc/src/main/kotlin/Libraries.kt

This file was deleted.

5 changes: 0 additions & 5 deletions buildSrc/src/main/kotlin/Projects.kt

This file was deleted.

8 changes: 0 additions & 8 deletions buildSrc/src/main/kotlin/Properties.kt

This file was deleted.

12 changes: 0 additions & 12 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,4 @@ kotlin.code.style=official
android.useAndroidX=true
android.enableJetifier=true

kotlin.version=1.7.20
compose.version=1.2.1

android-gradle-plugin.version=7.3.0
google-services.version=4.3.14

kotest.version=5.5.4
kotlin-wrappers-bom.version=1.0.0-pre.426

node.version=16.14.2
yarn.version=1.22.18

org.jetbrains.compose.experimental.jscanvas.enabled=true
Loading