Skip to content

Commit

Permalink
build: update dependencies
Browse files Browse the repository at this point in the history
* chore: upgrade dependencies

Signed-off-by: Josef Andersson <[email protected]>

* chore: fix deprecated toUpperCase. prepare Changelog

Signed-off-by: Josef Andersson <[email protected]>
  • Loading branch information
janderssonse authored Apr 25, 2022
1 parent c268218 commit 5eca25b
Show file tree
Hide file tree
Showing 7 changed files with 174 additions and 125 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

## 0.1.10 - 2021-08-09
## 0.1.11 - 2022-04-25

- Updated dependcies for base plugins. Gradle, Kotlin. Maintaince release, preparing for issue fixes.

### Deprecated
- The Git history - it was rebased
Expand Down
2 changes: 1 addition & 1 deletion DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ $ git clone
./gradlew publishToMavenLocal
```

3. In settings.gradle.kts, configure Gradle to look after local plugins (this has to be first in the file)
3. In settings.gradle.kts, configure Gradle to look for local plugins (this has to be first in the file)

```kotlin
pluginManagement {
Expand Down
30 changes: 14 additions & 16 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "1.4.31" //stick to the supported Gradle plugin version https://docs.gradle.org/current/userguide/compatibility.html
kotlin("jvm") version "1.6.0" //stick to the supported Gradle plugin version https://docs.gradle.org/current/userguide/compatibility.html
id("java-gradle-plugin")
id("se.ascp.gradle.gradle-versions-filter") version "0.1.9"
id("org.owasp.dependencycheck") version "6.2.2"
id("pl.allegro.tech.build.axion-release") version "1.13.3"
id("io.gitlab.arturbosch.detekt") version "1.17.1"
id("se.svt.oss.gradle-yapp-publisher-plugin") version "0.1.13"
id("se.ascp.gradle.gradle-versions-filter") version "0.1.10"
id("org.owasp.dependencycheck") version "7.1.0.1"
id("pl.allegro.tech.build.axion-release") version "1.13.6"
id("io.gitlab.arturbosch.detekt") version "1.20.0"
id("se.svt.oss.gradle-yapp-publisher-plugin") version "0.1.15"
}

group = "se.ascp.gradle"
project.version = scmVersion.version
project.version = "1.0.0-SNAPSHOT"//scmVersion.version

tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "11"
kotlin {
jvmToolchain {
(this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of(11))
}
}


repositories {
gradlePluginPortal()
mavenCentral()
Expand All @@ -32,11 +30,11 @@ tasks {
dependencies {
implementation("com.github.ben-manes:gradle-versions-plugin:[0.39.0,1.0.0)")

testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.2")
testImplementation("org.junit.jupiter:junit-jupiter-engine:5.7.2")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.2")
testImplementation("org.junit.jupiter:junit-jupiter-engine:5.8.2")
}

tasks.named<Wrapper>("wrapper") {
distributionType = Wrapper.DistributionType.ALL
gradleVersion = "7.1.1"
gradleVersion = "7.4.2"
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 5eca25b

Please sign in to comment.