From dc0302d2725622f919a5945245ebcaf428e87dd6 Mon Sep 17 00:00:00 2001 From: vladimir-shperling Date: Fri, 17 May 2024 02:52:25 +0700 Subject: [PATCH] make test lib as module --- .gitmodules | 6 - app/.gitignore | 1 - app/build.gradle.kts | 31 --- build.gradle.kts | 17 +- buildSrc | 1 - consumer-rules.pro | 0 gradle | 1 - gradle.properties | 21 -- gradlew | 185 ------------------ gradlew.bat | 89 --------- proguard-rules.pro | 21 ++ settings.gradle.kts | 17 -- .../ru/samsung}/test/core/core/BaseTest.kt | 0 .../core/core/DescriptionFailureHandler.kt | 0 .../test/core/utils/ResultTestsData.kt | 0 .../test/core/utils/UiTextViewExtensions.kt | 0 .../core/utils/UiViewBuilderExtensions.kt | 0 .../java/ru/samsung}/test/core/utils/Utils.kt | 0 18 files changed, 35 insertions(+), 355 deletions(-) delete mode 100644 .gitmodules delete mode 100644 app/.gitignore delete mode 100644 app/build.gradle.kts delete mode 160000 buildSrc create mode 100644 consumer-rules.pro delete mode 160000 gradle delete mode 100644 gradle.properties delete mode 100644 gradlew delete mode 100644 gradlew.bat create mode 100644 proguard-rules.pro delete mode 100644 settings.gradle.kts rename {app/src/main/java/ru/innovationcampus => src/main/java/ru/samsung}/test/core/core/BaseTest.kt (100%) rename {app/src/main/java/ru/innovationcampus => src/main/java/ru/samsung}/test/core/core/DescriptionFailureHandler.kt (100%) rename {app/src/main/java/ru/innovationcampus => src/main/java/ru/samsung}/test/core/utils/ResultTestsData.kt (100%) rename {app/src/main/java/ru/innovationcampus => src/main/java/ru/samsung}/test/core/utils/UiTextViewExtensions.kt (100%) rename {app/src/main/java/ru/innovationcampus => src/main/java/ru/samsung}/test/core/utils/UiViewBuilderExtensions.kt (100%) rename {app/src/main/java/ru/innovationcampus => src/main/java/ru/samsung}/test/core/utils/Utils.kt (100%) diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index b3f5536..0000000 --- a/.gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -[submodule "gradle"] - path = gradle - url = https://git.sicampus.ru/core/gradle.git -[submodule "buildSrc"] - path = buildSrc - url = https://git.sicampus.ru/core/dependecies.git diff --git a/app/.gitignore b/app/.gitignore deleted file mode 100644 index 42afabf..0000000 --- a/app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts deleted file mode 100644 index 94d9ae4..0000000 --- a/app/build.gradle.kts +++ /dev/null @@ -1,31 +0,0 @@ -plugins { - androidLibrary - kotlinAndroid -} - -val packageName = "ru.innovationcampus.test-lib" - -android { - namespace = packageName - compileSdk = Version.Android.Sdk.compile - - defaultConfig { - minSdk = Version.Android.Sdk.min - - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - } - - compileOptions { - sourceCompatibility = Version.Kotlin.javaSource - targetCompatibility = Version.Kotlin.javaSource - } -} - -dependencies { - api(Dependencies.Kaspresso.core) - api(Dependencies.Kaspresso.composeSupport) - api(Dependencies.AndroidX.Testing.junit) - api(Dependencies.AndroidX.Testing.compose) - api(Dependencies.AndroidX.Testing.orchestrator) - api(Dependencies.truth) -} diff --git a/build.gradle.kts b/build.gradle.kts index 074c663..f080b06 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,16 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - androidLibrary version Version.gradle apply false - kotlinAndroid version Version.Kotlin.language apply false + androidApplication } + +android { + namespace = "ru.samsung.test.core" +} + +dependencies { + api(Dependencies.Kaspresso.core) + api(Dependencies.Kaspresso.composeSupport) + api(Dependencies.AndroidX.Testing.junit) + api(Dependencies.AndroidX.Testing.compose) + api(Dependencies.AndroidX.Testing.orchestrator) + api(Dependencies.truth) +} \ No newline at end of file diff --git a/buildSrc b/buildSrc deleted file mode 160000 index e0cd40f..0000000 --- a/buildSrc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e0cd40f8a1d1e53eab146f4ae489a1cd943ac154 diff --git a/consumer-rules.pro b/consumer-rules.pro new file mode 100644 index 0000000..e69de29 diff --git a/gradle b/gradle deleted file mode 160000 index 206bac0..0000000 --- a/gradle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 206bac06d8e8838d392c6f1d00dc0879ea24e5d4 diff --git a/gradle.properties b/gradle.properties deleted file mode 100644 index 3e927b1..0000000 --- a/gradle.properties +++ /dev/null @@ -1,21 +0,0 @@ -# Project-wide Gradle settings. -# IDE (e.g. Android Studio) users: -# Gradle settings configured through the IDE *will override* -# any settings specified in this file. -# For more details on how to configure your build environment visit -# http://www.gradle.org/docs/current/userguide/build_environment.html -# Specifies the JVM arguments used for the daemon process. -# The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 -# When configured, Gradle will run in incubating parallel mode. -# This option should only be used with decoupled projects. More details, visit -# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true -# AndroidX package structure to make it clearer which packages are bundled with the -# Android operating system, and which are packaged with your app's APK -# https://developer.android.com/topic/libraries/support-library/androidx-rn -android.useAndroidX=true -# Enables namespacing of each library's R class so that its R class includes only the -# resources declared in the library itself and none from the library's dependencies, -# thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file diff --git a/gradlew b/gradlew deleted file mode 100644 index 4f906e0..0000000 --- a/gradlew +++ /dev/null @@ -1,185 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or 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 UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# 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 "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# 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 - ;; - 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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index 107acd3..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,89 +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=. -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 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%"=="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/proguard-rules.pro b/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts deleted file mode 100644 index 74b7a13..0000000 --- a/settings.gradle.kts +++ /dev/null @@ -1,17 +0,0 @@ -pluginManagement { - repositories { - google() - mavenCentral() - gradlePluginPortal() - } -} -dependencyResolutionManagement { - repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) - repositories { - google() - mavenCentral() - } -} - -rootProject.name = "TestCore" -include(":app") diff --git a/app/src/main/java/ru/innovationcampus/test/core/core/BaseTest.kt b/src/main/java/ru/samsung/test/core/core/BaseTest.kt similarity index 100% rename from app/src/main/java/ru/innovationcampus/test/core/core/BaseTest.kt rename to src/main/java/ru/samsung/test/core/core/BaseTest.kt diff --git a/app/src/main/java/ru/innovationcampus/test/core/core/DescriptionFailureHandler.kt b/src/main/java/ru/samsung/test/core/core/DescriptionFailureHandler.kt similarity index 100% rename from app/src/main/java/ru/innovationcampus/test/core/core/DescriptionFailureHandler.kt rename to src/main/java/ru/samsung/test/core/core/DescriptionFailureHandler.kt diff --git a/app/src/main/java/ru/innovationcampus/test/core/utils/ResultTestsData.kt b/src/main/java/ru/samsung/test/core/utils/ResultTestsData.kt similarity index 100% rename from app/src/main/java/ru/innovationcampus/test/core/utils/ResultTestsData.kt rename to src/main/java/ru/samsung/test/core/utils/ResultTestsData.kt diff --git a/app/src/main/java/ru/innovationcampus/test/core/utils/UiTextViewExtensions.kt b/src/main/java/ru/samsung/test/core/utils/UiTextViewExtensions.kt similarity index 100% rename from app/src/main/java/ru/innovationcampus/test/core/utils/UiTextViewExtensions.kt rename to src/main/java/ru/samsung/test/core/utils/UiTextViewExtensions.kt diff --git a/app/src/main/java/ru/innovationcampus/test/core/utils/UiViewBuilderExtensions.kt b/src/main/java/ru/samsung/test/core/utils/UiViewBuilderExtensions.kt similarity index 100% rename from app/src/main/java/ru/innovationcampus/test/core/utils/UiViewBuilderExtensions.kt rename to src/main/java/ru/samsung/test/core/utils/UiViewBuilderExtensions.kt diff --git a/app/src/main/java/ru/innovationcampus/test/core/utils/Utils.kt b/src/main/java/ru/samsung/test/core/utils/Utils.kt similarity index 100% rename from app/src/main/java/ru/innovationcampus/test/core/utils/Utils.kt rename to src/main/java/ru/samsung/test/core/utils/Utils.kt