From c5b624713e42fa1e97782d5939c43d3301f6c3a1 Mon Sep 17 00:00:00 2001 From: Nikita Lipsky Date: Thu, 11 May 2023 20:45:47 +0300 Subject: [PATCH] Restructure benchmarks folders (#3157) - move benchmarks content to benchmarks/desktop, benchmarks-intellij to benchmarks/intellij --- benchmarks/{ => desktop}/.gitignore | 0 benchmarks/{ => desktop}/README.md | 0 benchmarks/{ => desktop}/build.gradle.kts | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 benchmarks/{ => desktop}/gradlew | 0 benchmarks/{ => desktop}/gradlew.bat | 208 +++++++++--------- benchmarks/{ => desktop}/settings.gradle.kts | 0 .../src/main/kotlin/ParagraphBenchmark.kt | 0 .../src/main/resources/NotoSans-Italic.ttf | Bin .../intellij}/README.md | 0 .../intellij}/build.gradle.kts | 0 .../intellij}/gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../intellij}/gradlew | 0 .../intellij}/gradlew.bat | 0 .../intellij}/settings.gradle.kts | 0 .../jetbrains/compose/LifecycleListener.kt | 0 .../compose/benchmark/BenchmarkToolWindow.kt | 0 .../compose/benchmark/CounterPanel.kt | 0 .../compose/benchmark/CounterState.kt | 0 .../benchmark/PerformanceInfoDialog.kt | 0 .../kotlin/com/jetbrains/compose/measure.kt | 0 .../src/main/resources/META-INF/plugin.xml | 0 25 files changed, 104 insertions(+), 104 deletions(-) rename benchmarks/{ => desktop}/.gitignore (100%) rename benchmarks/{ => desktop}/README.md (100%) rename benchmarks/{ => desktop}/build.gradle.kts (100%) rename {benchmarks-intellij => benchmarks/desktop}/gradle/wrapper/gradle-wrapper.jar (100%) rename benchmarks/{ => desktop}/gradle/wrapper/gradle-wrapper.properties (100%) rename benchmarks/{ => desktop}/gradlew (100%) rename benchmarks/{ => desktop}/gradlew.bat (96%) rename benchmarks/{ => desktop}/settings.gradle.kts (100%) rename benchmarks/{ => desktop}/src/main/kotlin/ParagraphBenchmark.kt (100%) rename benchmarks/{ => desktop}/src/main/resources/NotoSans-Italic.ttf (100%) rename {benchmarks-intellij => benchmarks/intellij}/README.md (100%) rename {benchmarks-intellij => benchmarks/intellij}/build.gradle.kts (100%) rename {benchmarks-intellij => benchmarks/intellij}/gradle.properties (100%) rename benchmarks/{ => intellij}/gradle/wrapper/gradle-wrapper.jar (100%) rename {benchmarks-intellij => benchmarks/intellij}/gradle/wrapper/gradle-wrapper.properties (100%) rename {benchmarks-intellij => benchmarks/intellij}/gradlew (100%) rename {benchmarks-intellij => benchmarks/intellij}/gradlew.bat (100%) rename {benchmarks-intellij => benchmarks/intellij}/settings.gradle.kts (100%) rename {benchmarks-intellij => benchmarks/intellij}/src/main/kotlin/com/jetbrains/compose/LifecycleListener.kt (100%) rename {benchmarks-intellij => benchmarks/intellij}/src/main/kotlin/com/jetbrains/compose/benchmark/BenchmarkToolWindow.kt (100%) rename {benchmarks-intellij => benchmarks/intellij}/src/main/kotlin/com/jetbrains/compose/benchmark/CounterPanel.kt (100%) rename {benchmarks-intellij => benchmarks/intellij}/src/main/kotlin/com/jetbrains/compose/benchmark/CounterState.kt (100%) rename {benchmarks-intellij => benchmarks/intellij}/src/main/kotlin/com/jetbrains/compose/benchmark/PerformanceInfoDialog.kt (100%) rename {benchmarks-intellij => benchmarks/intellij}/src/main/kotlin/com/jetbrains/compose/measure.kt (100%) rename {benchmarks-intellij => benchmarks/intellij}/src/main/resources/META-INF/plugin.xml (100%) diff --git a/benchmarks/.gitignore b/benchmarks/desktop/.gitignore similarity index 100% rename from benchmarks/.gitignore rename to benchmarks/desktop/.gitignore diff --git a/benchmarks/README.md b/benchmarks/desktop/README.md similarity index 100% rename from benchmarks/README.md rename to benchmarks/desktop/README.md diff --git a/benchmarks/build.gradle.kts b/benchmarks/desktop/build.gradle.kts similarity index 100% rename from benchmarks/build.gradle.kts rename to benchmarks/desktop/build.gradle.kts diff --git a/benchmarks-intellij/gradle/wrapper/gradle-wrapper.jar b/benchmarks/desktop/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from benchmarks-intellij/gradle/wrapper/gradle-wrapper.jar rename to benchmarks/desktop/gradle/wrapper/gradle-wrapper.jar diff --git a/benchmarks/gradle/wrapper/gradle-wrapper.properties b/benchmarks/desktop/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from benchmarks/gradle/wrapper/gradle-wrapper.properties rename to benchmarks/desktop/gradle/wrapper/gradle-wrapper.properties diff --git a/benchmarks/gradlew b/benchmarks/desktop/gradlew similarity index 100% rename from benchmarks/gradlew rename to benchmarks/desktop/gradlew diff --git a/benchmarks/gradlew.bat b/benchmarks/desktop/gradlew.bat similarity index 96% rename from benchmarks/gradlew.bat rename to benchmarks/desktop/gradlew.bat index a9f778a7a9..5093609d51 100644 --- a/benchmarks/gradlew.bat +++ b/benchmarks/desktop/gradlew.bat @@ -1,104 +1,104 @@ -@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=. -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%" == "0" goto init - -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 init - -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 - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -: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 %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@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=. +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%" == "0" goto init + +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 init + +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 + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +: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 %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/benchmarks/settings.gradle.kts b/benchmarks/desktop/settings.gradle.kts similarity index 100% rename from benchmarks/settings.gradle.kts rename to benchmarks/desktop/settings.gradle.kts diff --git a/benchmarks/src/main/kotlin/ParagraphBenchmark.kt b/benchmarks/desktop/src/main/kotlin/ParagraphBenchmark.kt similarity index 100% rename from benchmarks/src/main/kotlin/ParagraphBenchmark.kt rename to benchmarks/desktop/src/main/kotlin/ParagraphBenchmark.kt diff --git a/benchmarks/src/main/resources/NotoSans-Italic.ttf b/benchmarks/desktop/src/main/resources/NotoSans-Italic.ttf similarity index 100% rename from benchmarks/src/main/resources/NotoSans-Italic.ttf rename to benchmarks/desktop/src/main/resources/NotoSans-Italic.ttf diff --git a/benchmarks-intellij/README.md b/benchmarks/intellij/README.md similarity index 100% rename from benchmarks-intellij/README.md rename to benchmarks/intellij/README.md diff --git a/benchmarks-intellij/build.gradle.kts b/benchmarks/intellij/build.gradle.kts similarity index 100% rename from benchmarks-intellij/build.gradle.kts rename to benchmarks/intellij/build.gradle.kts diff --git a/benchmarks-intellij/gradle.properties b/benchmarks/intellij/gradle.properties similarity index 100% rename from benchmarks-intellij/gradle.properties rename to benchmarks/intellij/gradle.properties diff --git a/benchmarks/gradle/wrapper/gradle-wrapper.jar b/benchmarks/intellij/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from benchmarks/gradle/wrapper/gradle-wrapper.jar rename to benchmarks/intellij/gradle/wrapper/gradle-wrapper.jar diff --git a/benchmarks-intellij/gradle/wrapper/gradle-wrapper.properties b/benchmarks/intellij/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from benchmarks-intellij/gradle/wrapper/gradle-wrapper.properties rename to benchmarks/intellij/gradle/wrapper/gradle-wrapper.properties diff --git a/benchmarks-intellij/gradlew b/benchmarks/intellij/gradlew similarity index 100% rename from benchmarks-intellij/gradlew rename to benchmarks/intellij/gradlew diff --git a/benchmarks-intellij/gradlew.bat b/benchmarks/intellij/gradlew.bat similarity index 100% rename from benchmarks-intellij/gradlew.bat rename to benchmarks/intellij/gradlew.bat diff --git a/benchmarks-intellij/settings.gradle.kts b/benchmarks/intellij/settings.gradle.kts similarity index 100% rename from benchmarks-intellij/settings.gradle.kts rename to benchmarks/intellij/settings.gradle.kts diff --git a/benchmarks-intellij/src/main/kotlin/com/jetbrains/compose/LifecycleListener.kt b/benchmarks/intellij/src/main/kotlin/com/jetbrains/compose/LifecycleListener.kt similarity index 100% rename from benchmarks-intellij/src/main/kotlin/com/jetbrains/compose/LifecycleListener.kt rename to benchmarks/intellij/src/main/kotlin/com/jetbrains/compose/LifecycleListener.kt diff --git a/benchmarks-intellij/src/main/kotlin/com/jetbrains/compose/benchmark/BenchmarkToolWindow.kt b/benchmarks/intellij/src/main/kotlin/com/jetbrains/compose/benchmark/BenchmarkToolWindow.kt similarity index 100% rename from benchmarks-intellij/src/main/kotlin/com/jetbrains/compose/benchmark/BenchmarkToolWindow.kt rename to benchmarks/intellij/src/main/kotlin/com/jetbrains/compose/benchmark/BenchmarkToolWindow.kt diff --git a/benchmarks-intellij/src/main/kotlin/com/jetbrains/compose/benchmark/CounterPanel.kt b/benchmarks/intellij/src/main/kotlin/com/jetbrains/compose/benchmark/CounterPanel.kt similarity index 100% rename from benchmarks-intellij/src/main/kotlin/com/jetbrains/compose/benchmark/CounterPanel.kt rename to benchmarks/intellij/src/main/kotlin/com/jetbrains/compose/benchmark/CounterPanel.kt diff --git a/benchmarks-intellij/src/main/kotlin/com/jetbrains/compose/benchmark/CounterState.kt b/benchmarks/intellij/src/main/kotlin/com/jetbrains/compose/benchmark/CounterState.kt similarity index 100% rename from benchmarks-intellij/src/main/kotlin/com/jetbrains/compose/benchmark/CounterState.kt rename to benchmarks/intellij/src/main/kotlin/com/jetbrains/compose/benchmark/CounterState.kt diff --git a/benchmarks-intellij/src/main/kotlin/com/jetbrains/compose/benchmark/PerformanceInfoDialog.kt b/benchmarks/intellij/src/main/kotlin/com/jetbrains/compose/benchmark/PerformanceInfoDialog.kt similarity index 100% rename from benchmarks-intellij/src/main/kotlin/com/jetbrains/compose/benchmark/PerformanceInfoDialog.kt rename to benchmarks/intellij/src/main/kotlin/com/jetbrains/compose/benchmark/PerformanceInfoDialog.kt diff --git a/benchmarks-intellij/src/main/kotlin/com/jetbrains/compose/measure.kt b/benchmarks/intellij/src/main/kotlin/com/jetbrains/compose/measure.kt similarity index 100% rename from benchmarks-intellij/src/main/kotlin/com/jetbrains/compose/measure.kt rename to benchmarks/intellij/src/main/kotlin/com/jetbrains/compose/measure.kt diff --git a/benchmarks-intellij/src/main/resources/META-INF/plugin.xml b/benchmarks/intellij/src/main/resources/META-INF/plugin.xml similarity index 100% rename from benchmarks-intellij/src/main/resources/META-INF/plugin.xml rename to benchmarks/intellij/src/main/resources/META-INF/plugin.xml