Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
QuasselDroid-ng
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Janne Mareike Koschinski
QuasselDroid-ng
Commits
9fb10b6b
Verified
Commit
9fb10b6b
authored
1 year ago
by
Janne Mareike Koschinski
Browse files
Options
Downloads
Patches
Plain Diff
build: properly set jdk version
parent
7f71fedd
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#2992
failed
1 year ago
Stage: test
Stage: release
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
gradle/convention/src/main/kotlin/KotlinAndroidConvention.kt
+0
-8
0 additions, 8 deletions
gradle/convention/src/main/kotlin/KotlinAndroidConvention.kt
gradle/convention/src/main/kotlin/KotlinConvention.kt
+0
-8
0 additions, 8 deletions
gradle/convention/src/main/kotlin/KotlinConvention.kt
with
0 additions
and
16 deletions
gradle/convention/src/main/kotlin/KotlinAndroidConvention.kt
+
0
−
8
View file @
9fb10b6b
...
...
@@ -21,14 +21,6 @@ class KotlinAndroidConvention : Plugin<Project> {
apply
(
"com.google.devtools.ksp"
)
}
val
service
=
project
.
extensions
.
getByType
<
JavaToolchainService
>()
val
customLauncher
=
service
.
launcherFor
{
languageVersion
.
set
(
JavaLanguageVersion
.
of
(
17
))
}
tasks
.
withType
<
UsesKotlinJavaToolchain
>().
configureEach
{
kotlinJavaToolchain
.
toolchain
.
use
(
customLauncher
)
}
// Use withType to workaround https://youtrack.jetbrains.com/issue/KT-55947
tasks
.
withType
<
KotlinCompile
>().
configureEach
{
kotlinOptions
{
...
...
This diff is collapsed.
Click to expand it.
gradle/convention/src/main/kotlin/KotlinConvention.kt
+
0
−
8
View file @
9fb10b6b
...
...
@@ -26,14 +26,6 @@ class KotlinConvention : Plugin<Project> {
apply
(
"com.google.devtools.ksp"
)
}
val
service
=
project
.
extensions
.
getByType
<
JavaToolchainService
>()
val
customLauncher
=
service
.
launcherFor
{
languageVersion
.
set
(
JavaLanguageVersion
.
of
(
17
))
}
tasks
.
withType
<
UsesKotlinJavaToolchain
>().
configureEach
{
kotlinJavaToolchain
.
toolchain
.
use
(
customLauncher
)
}
// Use withType to workaround https://youtrack.jetbrains.com/issue/KT-55947
tasks
.
withType
<
KotlinCompile
>().
configureEach
{
kotlinOptions
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment