diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..44acc569 --- /dev/null +++ b/build.gradle @@ -0,0 +1,139 @@ +import io.gitlab.arturbosch.detekt.Detekt +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +buildscript { + apply from: "gradle/dependencies.gradle" + + repositories { + mavenCentral() + gradlePluginPortal() + google() + } + + dependencies { + classpath libs.android.gradlePlugin + classpath libs.kotlinGradlePlugin + classpath libs.mavenPublishGradlePlugin + classpath libs.dokkaGradlePlugin + classpath libs.detekt.gradlePlugin + classpath libs.gradleVersions.gradlePlugin + } +} + +allprojects { + repositories { + mavenCentral() + google() + jcenter() + } + + group GROUP + version VERSION_NAME + + tasks.withType(Test) { + testLogging { + events "skipped", "failed", "passed" + } + } + + tasks.withType(JavaCompile) { + sourceCompatibility "1.8" + targetCompatibility "1.8" + } + + tasks.withType(KotlinCompile) { + kotlinOptions { + jvmTarget = "1.8" + freeCompilerArgs += [ + "-progressive", + "-Xjvm-default=enable", + ] + } + } + + pluginManager.withPlugin("com.android.library") { + android { + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + compileSdkVersion versions.androidBuild.compileSdk + + defaultConfig { + minSdkVersion versions.androidBuild.minSdk + targetSdkVersion versions.androidBuild.targetSdk + + vectorDrawables.useSupportLibrary true + } + + variantFilter { variant -> + setIgnore variant.name != "release" + } + + libraryVariants.all { variant -> + variant.outputs.all { + outputFileName = "${archivesBaseName}-${version}.aar" + } + } + + lintOptions { + lintConfig rootProject.file("lint.xml") + + htmlReport !isCi() + xmlReport isCi() + xmlOutput file("build/reports/lint/lint-results.xml") + + textReport true + textOutput "stdout" + explainIssues false + + checkDependencies false + checkGeneratedSources true + checkTestSources false + checkReleaseBuilds false + } + } + } +} + +apply plugin: libs.detekt.gradlePluginId + +dependencies { + detekt libs.detekt.formatting + detekt libs.detekt.cli +} + +tasks.withType(Detekt) { + parallel true + config.setFrom(rootProject.files("detekt-config.yml")) + setSource(files(projectDir)) + exclude "**/test/**", "**/androidTest/**" + exclude subprojects.collect { "${rootDir.toPath().relativize(it.buildDir.toPath())}/" } + reports { + xml { + enabled = isCi() + destination = file("build/reports/detekt/detekt-results.xml") + } + html.enabled = !isCi() + txt.enabled = false + } +} + +apply plugin: libs.gradleVersions.gradlePluginId + +dependencyUpdates { + rejectVersionIf { + isNonStable(it.candidate.version) && !isNonStable(it.currentVersion) + } +} + +private static def isNonStable(String version) { + def regex = /^[0-9,.v-]+(-r)?$/ + return !(version ==~ regex) +} + +private static def isCi() { + // noinspection GroovyPointlessBoolean + return System.getenv("CI")?.toBoolean() == true +} diff --git a/build.gradle.kts b/build.gradle.kts deleted file mode 100644 index 64e0312c..00000000 --- a/build.gradle.kts +++ /dev/null @@ -1,143 +0,0 @@ -import com.android.build.api.variant.VariantFilter -import com.android.build.gradle.BaseExtension -import com.android.build.gradle.LibraryPlugin -import com.android.build.gradle.internal.plugins.BasePlugin -import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask -import io.gitlab.arturbosch.detekt.Detekt -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - -plugins { - id(Libs.Detekt.GradlePluginId) version Libs.Detekt.Version - id(Libs.GradleVersions.GradlePluginId) version Libs.GradleVersions.Version -} - -buildscript { - repositories { - google() - gradlePluginPortal() - } - - dependencies { - classpath(Libs.AndroidGradlePlugin) - classpath(Libs.Kotlin.GradlePlugin) - classpath(Libs.MavenPublishGradlePlugin) - classpath(Libs.Detekt.GradlePlugin) - classpath(Libs.GradleVersions.GradlePlugin) - } -} - -allprojects { - repositories { - mavenCentral() - google() - jcenter() - } - - group = properties["GROUP"]!! - version = properties["VERSION_NAME"]!! - - tasks.withType { - testLogging { - events("skipped", "failed", "passed") - } - } - - tasks.withType { - sourceCompatibility = "1.8" - targetCompatibility = "1.8" - } - - tasks.withType { - kotlinOptions { - jvmTarget = "1.8" - freeCompilerArgs = listOf( - "-progressive", - "-XXLanguage:+NewInference", - "-Xjvm-default=enable" - ) - } - } - - plugins.withType { - extensions.findByType()?.apply { - variantFilter = Action { - ignore = name != "release" - } - } - } - - plugins.withType { - extension.compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - - extensions.findByType()?.apply { - compileSdkVersion(Build.CompileSdk) - buildToolsVersion(Build.BuildToolsVersion) - - defaultConfig { - minSdkVersion(Build.MinSdk) - targetSdkVersion(Build.CompileSdk) - - vectorDrawables.useSupportLibrary = true - } - - lintOptions { - lintConfig = rootProject.file("lint.xml") - - htmlReport = !isCi() - xmlReport = isCi() - xmlOutput = file("build/reports/lint/lint-results.xml") - - textReport = true - textOutput("stdout") - isExplainIssues = false - - isCheckDependencies = false - isCheckGeneratedSources = true - isCheckTestSources = false - isCheckReleaseBuilds = false - } - } - } -} - -dependencies { - detekt(Libs.Detekt.Formatting) - detekt(Libs.Detekt.Cli) -} - -tasks.withType { - parallel = true - config.setFrom(rootProject.file("detekt-config.yml")) - setSource(files(projectDir)) - exclude("**/test/**", "**/androidTest/**") - exclude("buildSrc/") - exclude("**/*.kts") - exclude(subprojects.map { "${it.buildDir.relativeTo(rootDir).path}/" }) - reports { - xml { - enabled = isCi() - destination = file("build/reports/detekt/detekt-results.xml") - } - html.enabled = !isCi() - txt.enabled = false - } -} - -tasks.register("check") { - group = "Verification" - description = "Allows to attach Detekt to the root project." -} - -tasks.withType { - rejectVersionIf { - isNonStable(candidate.version) && !isNonStable(currentVersion) - } -} - -fun isNonStable(version: String): Boolean { - val regex = "^[0-9,.v-]+(-r)?$".toRegex() - return !regex.matches(version) -} diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts deleted file mode 100644 index 93db5b28..00000000 --- a/buildSrc/build.gradle.kts +++ /dev/null @@ -1,11 +0,0 @@ -repositories { - gradlePluginPortal() -} - -plugins { - `kotlin-dsl` -} - -kotlinDslPluginOptions { - experimentalWarning.set(false) -} diff --git a/buildSrc/src/main/java/Build.kt b/buildSrc/src/main/java/Build.kt deleted file mode 100644 index bdcd1697..00000000 --- a/buildSrc/src/main/java/Build.kt +++ /dev/null @@ -1,5 +0,0 @@ -object Build { - const val BuildToolsVersion = "29.0.3" - const val CompileSdk = 29 - const val MinSdk = 21 -} diff --git a/buildSrc/src/main/java/BuildUtils.kt b/buildSrc/src/main/java/BuildUtils.kt deleted file mode 100644 index 9acf181b..00000000 --- a/buildSrc/src/main/java/BuildUtils.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun isCi(): Boolean { - return System.getenv("IS_CI")?.toBoolean() == true -} diff --git a/buildSrc/src/main/java/Libs.kt b/buildSrc/src/main/java/Libs.kt deleted file mode 100644 index eadafab4..00000000 --- a/buildSrc/src/main/java/Libs.kt +++ /dev/null @@ -1,55 +0,0 @@ -object Libs { - const val AndroidGradlePlugin = "com.android.tools.build:gradle:4.0.0" - - object Kotlin { - const val Version = "1.3.72" - - const val GradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$Version" - - const val StdLibJdk7 = "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$Version" - } - - object AndroidX { - object Test { - const val Version = "1.2.0" - - const val CoreKtx = "androidx.test:core-ktx:$Version" - } - } - - const val JUnit = "junit:junit:4.13" - - const val Robolectric = "org.robolectric:robolectric:4.3.1" - - object Kotest { - const val Version = "4.0.6" - - const val RunnerJunit5 = "io.kotest:kotest-runner-junit5-jvm:$Version" - - const val Assertions = "io.kotest:kotest-assertions-core-jvm:$Version" - - const val Property = "io.kotest:kotest-property-jvm:$Version" - } - - const val MavenPublishGradlePlugin = "com.vanniktech:gradle-maven-publish-plugin:0.11.1" - - object Detekt { - const val Version = "1.9.1" - - const val GradlePluginId = "io.gitlab.arturbosch.detekt" - - const val GradlePlugin = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$Version" - - const val Formatting = "io.gitlab.arturbosch.detekt:detekt-formatting:$Version" - - const val Cli = "io.gitlab.arturbosch.detekt:detekt-cli:$Version" - } - - object GradleVersions { - const val Version = "0.28.0" - - const val GradlePluginId = "com.github.ben-manes.versions" - - const val GradlePlugin = "com.github.ben-manes:gradle-versions-plugin:$Version" - } -} diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle new file mode 100644 index 00000000..2b8630b5 --- /dev/null +++ b/gradle/dependencies.gradle @@ -0,0 +1,36 @@ +ext.versions = [ + "kotest": "4.3.1", + "detekt": "1.14.2", + "androidBuild": [ + "minSdk": 21, + "compileSdk": 30, + "targetSdk": 30, + ], +] + +ext.libs = [ + "android": [ + "gradlePlugin": "com.android.tools.build:gradle:4.1.0", + "xTestCoreKtx": "androidx.test:core-ktx:1.3.0" + ], + "kotlinGradlePlugin": "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10", + "dokkaGradlePlugin": "org.jetbrains.dokka:dokka-gradle-plugin:1.4.10.2", + "kotest": [ + "runnerJunit5": "io.kotest:kotest-runner-junit5-jvm:${versions.kotest}", + "assertions": "io.kotest:kotest-assertions-core-jvm:${versions.kotest}", + "property": "io.kotest:kotest-property-jvm:${versions.kotest}", + ], + "mavenPublishGradlePlugin": "com.vanniktech:gradle-maven-publish-plugin:0.13.0", + "detekt": [ + "gradlePluginId": "io.gitlab.arturbosch.detekt", + "gradlePlugin": "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${versions.detekt}", + "formatting": "io.gitlab.arturbosch.detekt:detekt-formatting:${versions.detekt}", + "cli": "io.gitlab.arturbosch.detekt:detekt-cli:${versions.detekt}", + ], + "gradleVersions": [ + "gradlePlugin": "com.github.ben-manes:gradle-versions-plugin:0.36.0", + "gradlePluginId": "com.github.ben-manes.versions", + ], + "junit": "junit:junit:4.13.1", + "robolectric": "org.robolectric:robolectric:4.4", +] diff --git a/gradle/gradle-mvn-push.gradle b/gradle/gradle-mvn-push.gradle index 29a294c9..efd3bd4f 100644 --- a/gradle/gradle-mvn-push.gradle +++ b/gradle/gradle-mvn-push.gradle @@ -1,11 +1,8 @@ apply plugin: "com.vanniktech.maven.publish" -mavenPublish { - targets { - uploadArchives { - releaseRepositoryUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2" - snapshotRepositoryUrl = "https://oss.sonatype.org/content/repositories/snapshots" - signing = true - } +signing { + def signingKey = findProperty("SONATYPE_NEXUS_SIGNING_KEY") ?: "" + if (!signingKey.isEmpty()) { + useInMemoryPgpKeys signingKey, "" } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961fd..e708b1c0 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d77351d3..14e30f74 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Nov 29 16:00:23 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip diff --git a/gradlew b/gradlew index cccdd3d5..4f906e0c 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/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 @@ -28,7 +44,7 @@ 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="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -66,6 +82,7 @@ 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 @@ -109,10 +126,11 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# 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 @@ -138,19 +156,19 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + 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" ;; + 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 @@ -159,14 +177,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +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" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index f9553162..107acd32 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@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 @@ -13,15 +29,18 @@ 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= +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 +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,28 +64,14 @@ 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% +"%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 diff --git a/library/android/build.gradle b/library/android/build.gradle new file mode 100644 index 00000000..32c189aa --- /dev/null +++ b/library/android/build.gradle @@ -0,0 +1,24 @@ +plugins { + id "com.android.library" + id "org.jetbrains.kotlin.android" +} + +android { + resourcePrefix "io_mehow_ruler_" + + testOptions { + unitTests.includeAndroidResources true + } +} + +dependencies { + api project(":library:ruler") + + testImplementation libs.junit + testImplementation libs.kotest.assertions + testImplementation libs.android.xTestCoreKtx + testImplementation libs.robolectric + testImplementation libs.junit +} + +apply from: "$rootDir/gradle/gradle-mvn-push.gradle" diff --git a/library/android/build.gradle.kts b/library/android/build.gradle.kts deleted file mode 100644 index 53b20119..00000000 --- a/library/android/build.gradle.kts +++ /dev/null @@ -1,23 +0,0 @@ -plugins { - id("com.android.library") - kotlin("android") -} - -android { - resourcePrefix("io_mehow_ruler_") - - testOptions.unitTests.isIncludeAndroidResources = true -} - -dependencies { - api(project(":library:ruler")) - - implementation(Libs.Kotlin.StdLibJdk7) - - testImplementation(Libs.JUnit) - testImplementation(Libs.Kotest.Assertions) - testImplementation(Libs.AndroidX.Test.CoreKtx) - testImplementation(Libs.Robolectric) -} - -apply(from = rootProject.file("gradle/gradle-mvn-push.gradle")) diff --git a/library/android/src/main/java/io/mehow/ruler/Ruler.kt b/library/android/src/main/java/io/mehow/ruler/Ruler.kt index 4f9d6310..b6b5988d 100644 --- a/library/android/src/main/java/io/mehow/ruler/Ruler.kt +++ b/library/android/src/main/java/io/mehow/ruler/Ruler.kt @@ -3,7 +3,7 @@ package io.mehow.ruler import android.content.Context object Ruler { - private val converters = mutableListOf() + internal val converters = mutableListOf() @JvmStatic fun addConverter(converter: LengthConverter) = synchronized(this) { converters += converter @@ -22,7 +22,7 @@ object Ruler { } } - private val formatters = mutableListOf() + internal val formatters = mutableListOf() @JvmStatic fun addFormatter(formatter: LengthFormatter) = synchronized(this) { formatters += formatter @@ -58,7 +58,7 @@ object Ruler { synchronized(this) { func(ukCountryCode) } } - private val flooredFormatters = mutableListOf() + internal val flooredFormatters = mutableListOf() @JvmStatic fun addFlooredFormatter(formatter: LengthFormatter) = synchronized(this) { flooredFormatters += formatter diff --git a/library/android/src/test/java/io/mehow/ruler/FlooredDistanceFormatterTest.kt b/library/android/src/test/java/io/mehow/ruler/FlooredDistanceFormatterTest.kt index cb085606..45d158b4 100644 --- a/library/android/src/test/java/io/mehow/ruler/FlooredDistanceFormatterTest.kt +++ b/library/android/src/test/java/io/mehow/ruler/FlooredDistanceFormatterTest.kt @@ -3,7 +3,7 @@ package io.mehow.ruler import android.content.Context import android.content.res.Configuration import androidx.test.core.app.ApplicationProvider -import io.kotlintest.shouldBe +import io.kotest.matchers.shouldBe import io.mehow.ruler.ImperialLengthUnit.Foot import io.mehow.ruler.ImperialLengthUnit.Inch import io.mehow.ruler.ImperialLengthUnit.Mile diff --git a/library/android/src/test/java/io/mehow/ruler/ImperialDistanceFormatterTest.kt b/library/android/src/test/java/io/mehow/ruler/ImperialDistanceFormatterTest.kt index 1b7b7bf8..a327543d 100644 --- a/library/android/src/test/java/io/mehow/ruler/ImperialDistanceFormatterTest.kt +++ b/library/android/src/test/java/io/mehow/ruler/ImperialDistanceFormatterTest.kt @@ -2,7 +2,7 @@ package io.mehow.ruler import android.content.Context import androidx.test.core.app.ApplicationProvider -import io.kotlintest.shouldBe +import io.kotest.matchers.shouldBe import org.junit.Test import org.junit.runner.RunWith import org.robolectric.RobolectricTestRunner diff --git a/library/android/src/test/java/io/mehow/ruler/RulerTest.kt b/library/android/src/test/java/io/mehow/ruler/RulerTest.kt index 3ce3aa2c..9e242011 100644 --- a/library/android/src/test/java/io/mehow/ruler/RulerTest.kt +++ b/library/android/src/test/java/io/mehow/ruler/RulerTest.kt @@ -3,7 +3,7 @@ package io.mehow.ruler import android.content.Context import android.content.res.Configuration import androidx.test.core.app.ApplicationProvider -import io.kotlintest.shouldBe +import io.kotest.matchers.shouldBe import io.mehow.ruler.ImperialLengthUnit.Foot import io.mehow.ruler.ImperialLengthUnit.Inch import io.mehow.ruler.ImperialLengthUnit.Mile diff --git a/library/android/src/test/java/io/mehow/ruler/UkAsImperialTest.kt b/library/android/src/test/java/io/mehow/ruler/UkAsImperialTest.kt index f1845cdf..e3da3de4 100644 --- a/library/android/src/test/java/io/mehow/ruler/UkAsImperialTest.kt +++ b/library/android/src/test/java/io/mehow/ruler/UkAsImperialTest.kt @@ -3,7 +3,7 @@ package io.mehow.ruler import android.content.Context import android.content.res.Configuration import androidx.test.core.app.ApplicationProvider -import io.kotlintest.shouldBe +import io.kotest.matchers.shouldBe import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith diff --git a/library/ruler/build.gradle b/library/ruler/build.gradle new file mode 100644 index 00000000..42fcbb90 --- /dev/null +++ b/library/ruler/build.gradle @@ -0,0 +1,13 @@ +plugins { + id "org.jetbrains.kotlin.jvm" +} + +test.useJUnitPlatform() + +dependencies { + testImplementation libs.kotest.runnerJunit5 + testImplementation libs.kotest.assertions + testImplementation libs.kotest.property +} + +apply from: "$rootDir/gradle/gradle-mvn-push.gradle" diff --git a/library/ruler/build.gradle.kts b/library/ruler/build.gradle.kts deleted file mode 100644 index 86886a47..00000000 --- a/library/ruler/build.gradle.kts +++ /dev/null @@ -1,17 +0,0 @@ -plugins { - kotlin("jvm") -} - -tasks.withType { - useJUnitPlatform() -} - -dependencies { - implementation(Libs.Kotlin.StdLibJdk7) - - testImplementation(Libs.Kotest.RunnerJunit5) - testImplementation(Libs.Kotest.Assertions) - testImplementation(Libs.Kotest.Property) -} - -apply(from = rootProject.file("gradle/gradle-mvn-push.gradle")) diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..644427d4 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +include ":library:ruler" +include ":library:android" diff --git a/settings.gradle.kts b/settings.gradle.kts deleted file mode 100644 index 918ed78a..00000000 --- a/settings.gradle.kts +++ /dev/null @@ -1,2 +0,0 @@ -include(":library:ruler") -include(":library:android")