Merge branch 'main' into fix_admin_settings_hydration_20260627

build.gradle

@@ -47,15 +47,11 @@ ext {
     modernJavaVersion = 25
 }
 
-def buildJavaMajorVersion = (project.findProperty('javaVersion') ?: ext.modernJavaVersion).toString().toInteger()
-def buildJavaLanguageVersion = JavaLanguageVersion.of(buildJavaMajorVersion)
-def buildJavaVersion = JavaVersion.toVersion(buildJavaMajorVersion.toString())
-
 java {
-    sourceCompatibility = buildJavaVersion
-    targetCompatibility = buildJavaVersion
+    sourceCompatibility = JavaVersion.VERSION_25
+    targetCompatibility = JavaVersion.VERSION_25
     toolchain {
-        languageVersion = buildJavaLanguageVersion
+        languageVersion = JavaLanguageVersion.of(project.findProperty('javaVersion')?.toString() ?: '25')
     }
 }
 
@@ -175,10 +171,10 @@ subprojects {
     apply plugin: 'jacoco'
 
     java {
-        sourceCompatibility = buildJavaVersion
-        targetCompatibility = buildJavaVersion
+        sourceCompatibility = JavaVersion.VERSION_25
+        targetCompatibility = JavaVersion.VERSION_25
         toolchain {
-            languageVersion = buildJavaLanguageVersion
+            languageVersion = JavaLanguageVersion.of(25)
         }
     }
 
@@ -266,7 +262,7 @@ subprojects {
 
     tasks.withType(JavaCompile).configureEach {
         options.encoding = "UTF-8"
-        options.release = buildJavaMajorVersion
+        options.release = rootProject.ext.modernJavaVersion
         if (!project.hasProperty("noSpotless")) {
             dependsOn "spotlessApply"
         }
@@ -661,14 +657,10 @@ tasks.register('compileRestartHelper', JavaCompile) {
     source = fileTree(dir: 'scripts', include: 'RestartHelper.java')
     classpath = files()
     destinationDirectory = layout.buildDirectory.dir("restart-helper-classes")
-    def restartMajorVersion = buildJavaMajorVersion
-    def restartLanguageVersion = JavaLanguageVersion.of(restartMajorVersion)
+    def restartMajorVersion = project.ext.modernJavaVersion
     def restartCompatibility = JavaVersion.toVersion(restartMajorVersion.toString())
     sourceCompatibility = restartCompatibility
     targetCompatibility = restartCompatibility
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = restartLanguageVersion
-    }
     options.release.set(restartMajorVersion)
 }
 

frontend/editor/src/proprietary/components/shared/config/configSections/AdminGeneralSection.tsx

@@ -482,7 +482,7 @@ export default function AdminGeneralSection() {
             </div>
 
             <div>
-              <Text size="sm" fw={500} mb={4}>
+              <Text component="div" size="sm" fw={500} mb={4}>
                 <Group gap="xs">
                   <span>
                     {t("admin.settings.general.logoStyle.label", "Logo Style")}