From b46803189c025ffa158fb6f043af8fa10703ef36 Mon Sep 17 00:00:00 2001
From: Sergey Rymsha <sry@enonic.com>
Date: Tue, 5 May 2026 21:48:50 +0000
Subject: [PATCH] Upgrade to XP 8

Bump xpVersion from 8.0.0-SNAPSHOT to released 8.0.0-B4, add the
com.enonic.xp.settings plugin in settings.gradle (4.0.0-B1) which now
supplies the com.enonic.xp.base plugin version and the xplibs.* catalog,
and migrate the long-form com.enonic.xp:core-api / portal-api
compileOnly deps to xplibs.api.core / xplibs.api.portal. Drop the
now-redundant enonic-xp-base alias from gradle/libs.versions.toml.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 build.gradle              | 6 +++---
 gradle.properties         | 2 +-
 gradle/libs.versions.toml | 2 --
 settings.gradle           | 4 ++++
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 261ed2f..88c4db0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'jacoco'
     id 'maven-publish'
     alias( libs.plugins.enonic.defaults )
-    alias( libs.plugins.enonic.xp.base )
+    id 'com.enonic.xp.base'
 }
 
 repositories {
@@ -13,8 +13,8 @@ repositories {
 }
 
 dependencies {
-    compileOnly "com.enonic.xp:core-api:${xpVersion}"
-    compileOnly "com.enonic.xp:portal-api:${xpVersion}"
+    compileOnly xplibs.api.core
+    compileOnly xplibs.api.portal
     implementation 'org.thymeleaf:thymeleaf:3.1.5.RELEASE'
 
     testRuntimeOnly "com.fasterxml.jackson.core:jackson-databind:2.21.3"
diff --git a/gradle.properties b/gradle.properties
index 2a96b2e..f3db3a5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 group = com.enonic.lib
 projectName = lib-thymeleaf
-xpVersion = 8.0.0-SNAPSHOT
+xpVersion = 8.0.0-B4
 version=3.0.0-SNAPSHOT
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 416682e..f89f407 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,6 @@
 junit = "6.0.3"
 mockito = "5.23.0"
 enonicDefaults = "2.1.6"
-enonicXpGradle = "4.0.0-A3"
 
 [libraries]
 
@@ -15,4 +14,3 @@ mockito-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref =
 
 [plugins]
 enonic-defaults = { id = "com.enonic.defaults", version.ref = "enonicDefaults" }
-enonic-xp-base = { id = "com.enonic.xp.base", version.ref = "enonicXpGradle" }
diff --git a/settings.gradle b/settings.gradle
index 569adbf..7e30008 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,5 @@
+plugins {
+    id 'com.enonic.xp.settings' version '4.0.0-B1'
+}
+
 rootProject.name = projectName