Skip to content

Commit 9d94fa1

Browse files
committed
Merge branch 'github-main' into next-1.3.0
# Conflicts: # .github/readme/draft-release.png # .github/readme/run-debug-configurations.png # .github/readme/run-logs.png # .github/readme/settings-secrets.png # .github/readme/use-this-template.png # .github/template-cleanup/gradle.properties # .github/workflows/build.yml # .github/workflows/release.yml # .github/workflows/run-ui-tests.yml # CHANGELOG.md # README.md # gradle.properties # gradle/wrapper/gradle-wrapper.properties # settings.gradle.kts
2 parents ed1a03d + 5ab9b3d commit 9d94fa1

File tree

7 files changed

+12
-7
lines changed

7 files changed

+12
-7
lines changed

.run/Run Plugin.run.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<component name="ProjectRunConfigurationManager">
22
<configuration default="false" name="Run Plugin" type="GradleRunConfiguration" factoryName="Gradle">
3-
<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" />
3+
<log_file alias="IDE logs" path="$PROJECT_DIR$/build/idea-sandbox/*/log/idea.log" show_all="true" />
44
<ExternalSystemSettings>
55
<option name="executionName" />
66
<option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -19,6 +19,7 @@
1919
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
2020
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
2121
<DebugAllEnabled>false</DebugAllEnabled>
22+
<RunAsTest>false</RunAsTest>
2223
<method v="2" />
2324
</configuration>
24-
</component>
25+
</component>

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ platformPlugins =
2121
platformBundledPlugins = org.jetbrains.plugins.go
2222

2323
# Gradle Releases -> https://github.com/gradle/gradle/releases
24-
gradleVersion = 8.10
24+
gradleVersion = 8.10.2
2525

2626
# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
2727
kotlin.stdlib.default.dependency = false

gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ annotations = "24.1.0"
1010

1111
# plugins
1212
changelog = "2.2.1"
13-
intelliJPlatform = "2.0.1"
13+
intelliJPlatform = "2.1.0"
1414
kotlin = "1.9.25"
1515
kover = "0.8.3"
16-
qodana = "2024.1.9"
16+
qodana = "2024.2.3"
1717

1818
[libraries]
1919
junit = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit" }

gradle/wrapper/gradle-wrapper.jar

79 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

qodana.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# https://www.jetbrains.com/help/qodana/qodana-yaml.html
33

44
version: 1.0
5-
linter: jetbrains/qodana-jvm-community:latest
5+
linter: jetbrains/qodana-jvm-community:2024.2
66
projectJDK: "17"
77
profile:
88
name: qodana.recommended

settings.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
11
rootProject.name = "Go ORM Helper"
2+
3+
plugins {
4+
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
5+
}

0 commit comments

Comments
 (0)