Merge remote-tracking branch 'origin/master' into feat/setup_kotlin_mp_jvm
# Conflicts: # app/pom.xml # build.gradle.kts # buildSrc/build.gradle.kts # lib/pom.xml
This commit is contained in:
commit
1d6fa1c0ad
5 changed files with 7 additions and 19 deletions
16
.github/workflows/gradle.yml
vendored
16
.github/workflows/gradle.yml
vendored
|
@ -8,7 +8,6 @@ jobs:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
GRADLE_OPTS: "-Dorg.gradle.jvmargs=-XX:MaxMetaspaceSize=512m"
|
GRADLE_OPTS: "-Dorg.gradle.jvmargs=-XX:MaxMetaspaceSize=512m"
|
||||||
SONAR_JDK: "11"
|
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
|
@ -28,22 +27,7 @@ jobs:
|
||||||
- name: Grant execute permission for gradlew
|
- name: Grant execute permission for gradlew
|
||||||
run: chmod +x gradlew
|
run: chmod +x gradlew
|
||||||
|
|
||||||
- name: Cache SonarCloud packages
|
|
||||||
if: matrix.java-version == env.SONAR_JDK
|
|
||||||
uses: actions/cache@v3
|
|
||||||
with:
|
|
||||||
path: ~/.sonar/cache
|
|
||||||
key: ${{ runner.os }}-sonar
|
|
||||||
restore-keys: ${{ runner.os }}-sonar
|
|
||||||
|
|
||||||
- name: Test with Gradle
|
- name: Test with Gradle
|
||||||
uses: gradle/gradle-build-action@v2
|
uses: gradle/gradle-build-action@v2
|
||||||
with:
|
with:
|
||||||
arguments: build check --stacktrace -PtestsBadgeApiKey=${{ secrets.TESTS_BADGE_API_KEY }}
|
arguments: build check --stacktrace -PtestsBadgeApiKey=${{ secrets.TESTS_BADGE_API_KEY }}
|
||||||
|
|
||||||
- name: SonarCloud
|
|
||||||
if: success() && matrix.java-version == env.SONAR_JDK
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
|
|
||||||
run: ./gradlew sonar --info -Dsonar.verbose=true
|
|
||||||
|
|
|
@ -6,7 +6,7 @@ dependencies {
|
||||||
implementation("com.github.ben-manes:gradle-versions-plugin:0.47.0")
|
implementation("com.github.ben-manes:gradle-versions-plugin:0.47.0")
|
||||||
implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.0")
|
implementation("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.0")
|
||||||
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.8.20")
|
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.8.20")
|
||||||
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21")
|
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0")
|
||||||
implementation("org.jetbrains.kotlinx:kover-gradle-plugin:0.7.1")
|
implementation("org.jetbrains.kotlinx:kover-gradle-plugin:0.7.1")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
3
gradle/wrapper/gradle-wrapper.properties
vendored
3
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,6 +1,7 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|
5
gradlew
vendored
5
gradlew
vendored
|
@ -130,10 +130,13 @@ location of your Java installation."
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
JAVACMD=java
|
JAVACMD=java
|
||||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
if ! command -v java >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue