Skip to content

Commit

Permalink
Fiksar Kotlin-oppsettet (#1459)
Browse files Browse the repository at this point in the history
* Nyaste kotlin-patchversjon er strengare på testFixturesImplementation-imports igjen, så endrar for det

* Flyttar Kotlin-versjoneringa inn i buildSrc-mappa, der det kjens meir naturleg at ho høyrer heime. Lyttar med det samme på endringar i denne mappa for gradle-bygga, så vi avdekkar feil før merge heller enn etter
  • Loading branch information
madsop-nav authored Sep 5, 2024
1 parent 6b92e93 commit 84f93eb
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 9 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/app-innsendt-soeknad.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@ on:
paths:
- apps/innsendt-soeknad/**
- gradle/libs.versions.toml
- buildSrc/**
pull_request:
branches:
- main
paths:
- apps/innsendt-soeknad/**
- gradle/libs.versions.toml
- buildSrc/**

jobs:
test:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/app-selvbetjening-backend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@ on:
paths:
- apps/selvbetjening-backend/**
- gradle/libs.versions.toml
- buildSrc/**
pull_request:
branches:
- main
paths:
- apps/selvbetjening-backend/**
- gradle/libs.versions.toml
- buildSrc/**

jobs:
test:
Expand Down
9 changes: 5 additions & 4 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import ca.cutterslade.gradle.analyze.AnalyzeDependenciesTask
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "2.0.20"
`kotlin-dsl`
alias(libs.plugins.cutterslade.analyze) apply true
}
Expand All @@ -12,8 +13,8 @@ version = "unspecified"
repositories {
gradlePluginPortal()
maven(
//name = "JCenter Gradle Plugins",
url = "https://dl.bintray.com/gradle/gradle-plugins"
// name = "JCenter Gradle Plugins",
url = "https://dl.bintray.com/gradle/gradle-plugins",
)
}

Expand All @@ -40,4 +41,4 @@ tasks {
warnUsedUndeclared = true
warnUnusedDeclared = true
}
}
}
1 change: 1 addition & 0 deletions libs/utils/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ dependencies {
testRuntimeOnly(libs.jupiter.engine)
testImplementation(libs.kotest.assertions.core)
testImplementation(libs.mockk)
testFixturesImplementation(libs.etterlatte.common)
}
6 changes: 1 addition & 5 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
rootProject.name = "pensjon-etterlatte-root"

plugins {
kotlin("jvm") version "2.0.20" apply false
}

include(
"apps:selvbetjening-backend",
"apps:innsendt-soeknad",
"libs:utils",
)
)

0 comments on commit 84f93eb

Please sign in to comment.