Skip to content

Commit

Permalink
chore: Solve Gradle 9 incompatibility issues (#2692)
Browse files Browse the repository at this point in the history
  • Loading branch information
StaNov authored Nov 17, 2024
1 parent 50aa511 commit d9ca016
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 10 deletions.
2 changes: 1 addition & 1 deletion backend/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ dependencies {
/**
* Conditional billing module
*/
if (rootProject.project(":billing-app").projectDir.exists()) {
if (gradle.ext.billingAppDirectory.exists()) {
implementation(project(':billing-app'))
}

Expand Down
1 change: 0 additions & 1 deletion backend/data/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ apply plugin: 'org.hibernate.orm'

repositories {
mavenCentral()
jcenter()
}

idea {
Expand Down
1 change: 0 additions & 1 deletion backend/testing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ apply plugin: "kotlin-kapt"

repositories {
mavenCentral()
jcenter()
}

kotlin {
Expand Down
5 changes: 2 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,8 @@ project(':server-app').afterEvaluate {
project(':ee-app').tasks.findByName("diffChangelog"),
]

def billingDiffChangelog = project(':billing-app').tasks.findByName("diffChangelog")

if (billingDiffChangelog != null) {
if (gradle.ext.billingAppDirectory.exists()) {
def billingDiffChangelog = project(':billing-app').tasks.findByName("diffChangelog")
finalizedBy.add(billingDiffChangelog)
}

Expand Down
15 changes: 11 additions & 4 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,18 @@ project(':server-app').projectDir = new File('backend/app')
include ':data'
project(':data').projectDir = new File('backend/data')

include ':billing-app'
project(':billing-app').projectDir = new File('../billing/app')
gradle.ext.billingAppDirectory = new File('../billing/app')
gradle.ext.billingTestDirectory = new File('../billing/tests')

include ':billing-test'
project(':billing-test').projectDir = new File('../billing/tests')
if (gradle.ext.billingAppDirectory.exists()) {
include ':billing-app'
project(':billing-app').projectDir = gradle.ext.billingAppDirectory
}

if (gradle.ext.billingTestDirectory.exists()) {
include ':billing-test'
project(':billing-test').projectDir = gradle.ext.billingTestDirectory
}

include ':testing'
project(':testing').projectDir = new File('backend/testing')
Expand Down

0 comments on commit d9ca016

Please sign in to comment.