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

Update Gradle Plugin to 7.4.2 + Fix Overflowing Poetry #257

Merged
merged 4 commits into from
Nov 3, 2023
Merged

Update Gradle Plugin to 7.4.2 + Fix Overflowing Poetry #257

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a60d6d8
bump gradle version to match
davissuber Oct 20, 2023
29d56d8
avoid apply plugin
davissuber Oct 21, 2023
b2a75d4
pass in resolved type info
davissuber Oct 27, 2023
88c9c0a
remove unused kapt plugin directive
davissuber Nov 3, 2023
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
4 changes: 3 additions & 1 deletion ast/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ plugins {

apply plugin: 'kotlin-kapt'

sourceCompatibility = 1.8
kotlin {
jvmToolchain(11)
}

dependencies {
implementation deps.kotlin.stdlib
Expand Down
5 changes: 3 additions & 2 deletions compiler/ast/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ plugins {

apply plugin: 'kotlin-kapt'

sourceCompatibility = 1.8

kotlin {
jvmToolchain(11)
}

dependencies {
implementation deps.kotlin.stdlib
Expand Down
4 changes: 3 additions & 1 deletion compiler/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ plugins {
id 'org.jetbrains.dokka'
}

sourceCompatibility = 1.8
kotlin {
jvmToolchain(11)
}

dependencies {
implementation deps.kotlin.stdlib
Expand Down
4 changes: 3 additions & 1 deletion compiler/ksp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ plugins {
id 'org.jetbrains.kotlin.jvm'
}

sourceCompatibility = 1.8
kotlin {
jvmToolchain(11)
}

dependencies {
implementation deps.kotlin.stdlib
Expand Down
4 changes: 3 additions & 1 deletion core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ plugins {
id 'org.jetbrains.dokka'
}

sourceCompatibility = 1.8
kotlin {
jvmToolchain(11)
}

dependencies {
api project(':models')
Expand Down
5 changes: 3 additions & 2 deletions errormessage/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ plugins {
id 'org.jetbrains.dokka'
}

sourceCompatibility = 1.8

kotlin {
jvmToolchain(11)
}

dependencies {
implementation deps.kotlin.stdlib
Expand Down
4 changes: 2 additions & 2 deletions gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ ext.deps = [
targetSdkVersion: 30,

gradlePlugins: [
android: 'com.android.tools.build:gradle:4.2.0',
android: 'com.android.tools.build:gradle:7.4.2',
kotlin: "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}",
ksp: "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:${versions.ksp}",
dokka: "org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}",
mavenPublish: 'com.vanniktech:gradle-maven-publish-plugin:0.18.0',
spotless: "com.diffplug.spotless:spotless-plugin-gradle:5.11.0",
shadow: "com.github.jengelman.gradle.plugins:shadow:6.1.0",
shadow: "com.github.johnrengelman:shadow:8.1.0",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This looks questionable - but it is still the same library - upgrade is needed for the new gradle plugin version.

]
],
"kotlin": [
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
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.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
5 changes: 3 additions & 2 deletions models/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ plugins {

apply plugin: 'kotlin-kapt'

sourceCompatibility = 1.8

kotlin {
jvmToolchain(11)
}

dependencies {
api project(':ast')
Expand Down
8 changes: 6 additions & 2 deletions samples/sample-kotlin-ksp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ plugins {
id 'org.jetbrains.kotlin.android'
}

kotlin {
jvmToolchain(11)
}

android {
compileSdkVersion deps.build.compileSdkVersion
buildToolsVersion deps.build.buildToolsVersion
Expand All @@ -26,8 +30,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure how useful these are, much of the code is already in kotlin.

targetCompatibility JavaVersion.VERSION_11
}

variantFilter { variant ->
Expand Down
8 changes: 6 additions & 2 deletions samples/sample-kotlin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ plugins {
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'

kotlin {
jvmToolchain(11)
}

android {
compileSdkVersion deps.build.compileSdkVersion
buildToolsVersion deps.build.buildToolsVersion
Expand All @@ -25,8 +29,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}

variantFilter { variant ->
Expand Down
8 changes: 6 additions & 2 deletions samples/sample-lib-ksp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ plugins {
id 'org.jetbrains.kotlin.android'
}

kotlin {
jvmToolchain(11)
}

android {
namespace 'com.example.sample_lib_ksp'
compileSdkVersion deps.build.compileSdkVersion
Expand All @@ -26,8 +30,8 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}

androidComponents {
Expand Down
4 changes: 3 additions & 1 deletion tests/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ apply plugin: 'java-library'
apply plugin: 'kotlin'
apply plugin: 'kotlin-kapt'

sourceCompatibility = 1.8
kotlin {
jvmToolchain(11)
}

kotlin {
sourceSets {
Expand Down
4 changes: 3 additions & 1 deletion tests/compiler/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ plugins {
id 'org.jetbrains.kotlin.jvm'
}

sourceCompatibility = 1.8
kotlin {
jvmToolchain(11)
}

dependencies {
implementation deps.autoCommon
Expand Down
4 changes: 3 additions & 1 deletion viewmodel/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ plugins {
id 'org.jetbrains.dokka'
}

sourceCompatibility = 1.8
kotlin {
jvmToolchain(11)
}

dependencies {
api project(':core')
Expand Down
2 changes: 1 addition & 1 deletion xprocessing-testing/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ shadowJar {
dependencies {
include dependency(deps.test.roomCompilerProcessingTesting)
}
classifier = ''
archiveClassifier = ''
configurations = [shadedConfig]
mergeServiceFiles()
relocate 'androidx.room.compiler.processing', 'motif.compiler.processing'
Expand Down
2 changes: 1 addition & 1 deletion xprocessing/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ shadowJar {
dependencies {
include dependency(deps.roomCompilerProcessing)
}
classifier = ''
archiveClassifier = ''
configurations = [shadedConfig]
mergeServiceFiles()
relocate 'androidx.room.compiler.processing', 'motif.compiler.processing'
Expand Down