Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Kotlin and Gradle #69

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update Kotlin and Gradle #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bef3afc
Update Kotlin and Gradle
raphaelm Jun 17, 2024
3a6ad6a
Update gradle files to 8.6
robbi5 Jun 18, 2024
c85aea7
Raise jvm to 11
raphaelm Jun 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 26 additions & 27 deletions pretixscan/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
group 'eu.pretix.pretixscan'
version = project.properties['version']
project.version version

import org.gradle.internal.os.OperatingSystem
apply from: 'libpretixsync-repo/libpretixsync/versions.gradle'

ext {
operatingSystem = OperatingSystem.current()
}

repositories {
jcenter()
mavenCentral()
}

buildscript {
repositories {
jcenter()
Expand All @@ -27,20 +11,35 @@ buildscript {
classpath "net.ltgt.gradle:gradle-apt-plugin:0.17"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
classpath "net.ltgt.gradle:gradle-apt-plugin:0.17"

no longer needed in newer gradle versions :)

classpath group: 'de.dynamicfiles.projects.gradle.plugins', name: 'javafx-gradle-plugin', version: '8.8.2'
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.1'
classpath 'org.openjfx:javafx-plugin:0.0.7'
}
}
plugins {
id 'application'
id 'org.jetbrains.kotlin.jvm' version '1.9.23' apply false
id 'org.jetbrains.kotlin.kapt' version '1.9.23' apply false
}

group 'eu.pretix.pretixscan'
version = project.properties['version']
project.version version

import org.gradle.internal.os.OperatingSystem
apply from: 'libpretixsync-repo/libpretixsync/versions.gradle'

apply plugin: 'base'
apply plugin: 'kotlin'
apply plugin: 'kotlin-kapt'
apply plugin: 'net.ltgt.apt-idea'
ext {
operatingSystem = OperatingSystem.current()
}

repositories {
jcenter()
mavenCentral()
}

subprojects {
apply plugin: 'java'
apply plugin: 'kotlin'

sourceCompatibility = 1.8
sourceCompatibility = 11

repositories {
jcenter()
Expand All @@ -54,13 +53,13 @@ subprojects {
}

compileKotlin {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11

kotlinOptions {
jvmTarget = "1.8"
apiVersion = "1.5"
languageVersion = "1.5"
jvmTarget = "11"
apiVersion = "1.9"
languageVersion = "1.9"
}
}
dependencies {
Expand Down
Binary file modified pretixscan/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
4 changes: 3 additions & 1 deletion pretixscan/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading