diff --git a/app/build.gradle b/app/build.gradle index 9f6610ca2..08650d0a4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -147,10 +147,9 @@ jacocoTestReport { } dependencies { - annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' + annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' // handles @ConfigurationProperties implementation project(':common') implementation project(':ui') - implementation project(':webui') implementation 'org.springframework.boot:spring-boot-starter-json' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-validation' diff --git a/build.gradle b/build.gradle index 1e730be99..f0c54d313 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ plugins { // To upgrade Gradle, change the version here, refresh, then run the 'wrapper' task wrapper { - gradleVersion = '8.0.2' + gradleVersion = '8.1.1' } subprojects { diff --git a/common/build.gradle b/common/build.gradle index 2bc436af7..a283e46c8 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -56,4 +56,5 @@ dependencies { exclude group: "com.vaadin.external.google", module: "android-json" } testFixturesImplementation 'org.apache.commons:commons-lang3' + testImplementation(testFixtures(project(":common"))) } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bdc9a83b1..37aef8d3f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle b/settings.gradle index bc485e197..b3f42d117 100644 --- a/settings.gradle +++ b/settings.gradle @@ -33,5 +33,4 @@ gradleEnterprise { rootProject.name = 'Xeres' include 'ui' include 'app' -include 'webui' include 'common' diff --git a/webui/README.md b/webui/README.md index c5f765fa2..2d779087c 100644 --- a/webui/README.md +++ b/webui/README.md @@ -4,3 +4,5 @@ To upgrade Angular, use https://update.angular.io/ and pray. And because it breaks all the time, there's no Angular stuff here anymore. If you want to write a web frontend, feel free to restart it here. + +Note that the module is currently removed from the gradle build.