diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6aefa63..6156c07 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,10 +19,6 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: ./gradlew build publishToMavenLocal -PciBuild=true - - name: Test Gradle Platform - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: platform-test/ci.sh - name: Archive test report uses: actions/upload-artifact@v3 if: always() diff --git a/build.gradle.kts b/build.gradle.kts index 00d8b22..6dbd135 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,12 +1,7 @@ -/* - * This file was generated by the Gradle 'init' task. - * - * This is a general purpose Gradle build. - * Learn more about Gradle by exploring our samples at https://docs.gradle.org/8.0.2/samples - */ plugins { `java-platform` `maven-publish` + `version-catalog` } dependencies { @@ -72,10 +67,6 @@ dependencies { api(libs.modelix.incremental.js) api(libs.modelix.incremental.jvm) - //mps build tools - api(libs.modelix.build.tools.lib) - api(libs.modelix.build.tools.gradle) - api(libs.modelix.build.tools.plugin) } } @@ -113,41 +104,3 @@ publishing { } } } -subprojects { - apply(plugin="java-platform") - apply(plugin="maven-publish") - - publishing { - publications { - create("modelixMpsPlatform") { - group = "org.modelix" - version = platformVersion - - from(components["javaPlatform"]) - } - } - repositories { - maven { - name = "itemis" - url = if (version.toString().contains("SNAPSHOT")) { - uri("https://artifacts.itemis.cloud/repository/maven-mps-snapshots/") - } else { - uri("https://artifacts.itemis.cloud/repository/maven-mps-releases/") - } - credentials { - username = project.findProperty("artifacts.itemis.cloud.user").toString() - password = project.findProperty("artifacts.itemis.cloud.pw").toString() - } - } - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/modelix/modelix.platform") - credentials { - username = project.findProperty("gpr.user") as? String ?: System.getenv("GITHUB_ACTOR") - password = project.findProperty("gpr.key") as? String ?: System.getenv("GITHUB_TOKEN") - } - } - } - } -} - diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bb5cd26..f8c07f7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,6 @@ core = "3.12.1" incremental = "0.2.0" buildTools = "1.1.0" -modelixMPSPatch = "157" [libraries] modelix-authorization = { group = "org.modelix", name = "authorization", version.ref = "core"} diff --git a/platform-mps-2020-3/build.gradle.kts b/platform-mps-2020-3/build.gradle.kts deleted file mode 100644 index 588e923..0000000 --- a/platform-mps-2020-3/build.gradle.kts +++ /dev/null @@ -1,18 +0,0 @@ -val modelixVersion = "2020.3.${libs.versions.modelixMPSPatch}" -val platformVersion = file("../platform_version.txt").readText().trim() - -javaPlatform { - allowDependencies() -} - -dependencies { - api(platform("org.modelix:platform:$platformVersion")) - constraints { - api("org.modelix:model-download-gradle:$modelixVersion") - api("org.modelix.mps.model-download-gradle:org.modelix.mps.model-download-gradle.gradle.plugin:$modelixVersion") - api("org.modelix.mps:model-server-sync-plugin:$modelixVersion") - api("org.modelix.mps:build-solution:$modelixVersion") - api("org.modelix.mps:web-editors-plugin:$modelixVersion") - } -} - diff --git a/platform-mps-2021-1/build.gradle.kts b/platform-mps-2021-1/build.gradle.kts deleted file mode 100644 index 4b03601..0000000 --- a/platform-mps-2021-1/build.gradle.kts +++ /dev/null @@ -1,18 +0,0 @@ -val modelixVersion = "2021.1.${libs.versions.modelixMPSPatch}" -val platformVersion = file("../platform_version.txt").readText().trim() - -javaPlatform { - allowDependencies() -} - -dependencies { - api(platform("org.modelix:platform:$platformVersion")) - constraints { - api("org.modelix:model-download-gradle:$modelixVersion") - api("org.modelix.mps.model-download-gradle:org.modelix.mps.model-download-gradle.gradle.plugin:$modelixVersion") - api("org.modelix.mps:model-server-sync-plugin:$modelixVersion") - api("org.modelix.mps:build-solution:$modelixVersion") - api("org.modelix.mps:web-editors-plugin:$modelixVersion") - } -} - diff --git a/platform-mps-2021-2/build.gradle.kts b/platform-mps-2021-2/build.gradle.kts deleted file mode 100644 index bb0c00e..0000000 --- a/platform-mps-2021-2/build.gradle.kts +++ /dev/null @@ -1,18 +0,0 @@ -val modelixVersion = "2021.2.$${libs.versions.modelixMPSPatch}" -val platformVersion = file("../platform_version.txt").readText().trim() - -javaPlatform { - allowDependencies() -} - -dependencies { - api(platform("org.modelix:platform:$platformVersion")) - constraints { - api("org.modelix:model-download-gradle:$modelixVersion") - api("org.modelix.mps.model-download-gradle:org.modelix.mps.model-download-gradle.gradle.plugin:$modelixVersion") - api("org.modelix.mps:model-server-sync-plugin:$modelixVersion") - api("org.modelix.mps:build-solution:$modelixVersion") - api("org.modelix.mps:web-editors-plugin:$modelixVersion") - } -} - diff --git a/platform-mps-2021-3/build.gradle.kts b/platform-mps-2021-3/build.gradle.kts deleted file mode 100644 index ac20603..0000000 --- a/platform-mps-2021-3/build.gradle.kts +++ /dev/null @@ -1,18 +0,0 @@ -val modelixVersion = "2021.3.${libs.versions.modelixMPSPatch}" -val platformVersion = file("../platform_version.txt").readText().trim() - -javaPlatform { - allowDependencies() -} - -dependencies { - api(platform("org.modelix:platform:$platformVersion")) - constraints { - api("org.modelix:model-download-gradle:$modelixVersion") - api("org.modelix.mps.model-download-gradle:org.modelix.mps.model-download-gradle.gradle.plugin:$modelixVersion") - api("org.modelix.mps:model-server-sync-plugin:$modelixVersion") - api("org.modelix.mps:build-solution:$modelixVersion") - api("org.modelix.mps:web-editors-plugin:$modelixVersion") - } -} - diff --git a/platform-test/ci.sh b/platform-test/ci.sh deleted file mode 100755 index e9aa833..0000000 --- a/platform-test/ci.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -set -e -( - cd "$(dirname "$0")" - ./gradlew build -) diff --git a/platform-test/gradle/wrapper/gradle-wrapper.jar b/platform-test/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index ccebba7..0000000 Binary files a/platform-test/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/platform-test/gradle/wrapper/gradle-wrapper.properties b/platform-test/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index bdc9a83..0000000 --- a/platform-test/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,6 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip -networkTimeout=10000 -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/platform-test/gradlew b/platform-test/gradlew deleted file mode 100755 index 79a61d4..0000000 --- a/platform-test/gradlew +++ /dev/null @@ -1,244 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# Gradle start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh Gradle -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/platform-test/gradlew.bat b/platform-test/gradlew.bat deleted file mode 100644 index 93e3f59..0000000 --- a/platform-test/gradlew.bat +++ /dev/null @@ -1,92 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/platform_version.txt b/platform_version.txt index 9b49ab9..ec6149f 100644 --- a/platform_version.txt +++ b/platform_version.txt @@ -1 +1 @@ -23.0.0-test \ No newline at end of file +24.1.0-test \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 204152d..b6fbb87 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,15 +1,3 @@ -/* - * This file was generated by the Gradle 'init' task. - * - * The settings file is used to specify which projects to include in your build. - * - * Detailed information about configuring a multi-project build in Gradle can be found - * in the user manual at https://docs.gradle.org/8.0.2/userguide/multi_project_builds.html - */ - rootProject.name = "platform" -include("platform-mps-2020-3") -include("platform-mps-2021-1") -include("platform-mps-2021-2") -include("platform-mps-2021-3") +includeBuild("platform-test")