fixed zones

SuTeren · Jan 1, 2025 · 94ccd51 · 94ccd51
1 parent 5b00b0c
commit 94ccd51
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -23,6 +23,7 @@ dependencies {
 	implementation libs.info.picocli
 	implementation libs.com.fasterxml.jackson.dataformat.jackson.dataformat.yaml
 	implementation libs.com.vdurmont.semver4j
+	implementation libs.org.apache.ivy
 
 	annotationProcessor libs.info.picocli.picocli.codegen
 
@@ -37,6 +38,9 @@ compileJava {
 java {
 	withSourcesJar()
 	withJavadocJar()
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(17)
+	}
 }
 
 test {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -18,6 +18,7 @@ org-junit-jupiter-junit-jupiter = "org.junit.jupiter:junit-jupiter:5.11.4"
 org-projectlombok-lombok = "org.projectlombok:lombok:1.18.36"
 org-slf4j-slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "org-slf4j" }
 org-slf4j-slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "org-slf4j" }
+org-apache-ivy = "org.apache.ivy:ivy:2.5.3"
 
 [plugins]
 com-github-ben-manes-versions = "com.github.ben-manes.versions:0.51.0"

diff --git 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.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/src/main/java/net/suteren/netatmo/domain/therm/Zone.java b/src/main/java/net/suteren/netatmo/domain/therm/Zone.java
@@ -14,5 +14,6 @@ public record Zone(
 	String name,
 	int type,
 	@JsonProperty("rooms_temp") List<RoomTemp> roomstemp,
-	List<Room> rooms
+	List<Room> rooms,
+	List<Module> modules
 ) {}