diff --git a/app-common/build.gradle.kts b/app-common/build.gradle.kts index 60cc5753..1bc68e61 100644 --- a/app-common/build.gradle.kts +++ b/app-common/build.gradle.kts @@ -21,7 +21,6 @@ android { buildConfigField("String", "VERSION_NAME", "\"${ProjectConfig.Version.name}\"") buildConfigField("String", "APPLICATION_ID", "\"${ProjectConfig.packageName}\"") buildConfigField("String", "GITSHA", "\"${lastCommitHash()}\"") - buildConfigField("String", "BUILDTIME", "\"${buildTime()}\"") } buildFeatures { @@ -77,6 +76,7 @@ android { unitTests { isIncludeAndroidResources = true } + //noinspection WrongGradleMethod tasks.withType { useJUnitPlatform() } diff --git a/app-common/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt b/app-common/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt index 729a45fc..e42f99fe 100644 --- a/app-common/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt +++ b/app-common/src/main/java/eu/darken/capod/common/BuildConfigWrap.kt @@ -37,7 +37,6 @@ object BuildConfigWrap { val VERSION_CODE: Long = BuildConfig.VERSION_CODE.toLong() val VERSION_NAME: String = BuildConfig.VERSION_NAME val GIT_SHA: String = BuildConfig.GITSHA - val BUILDTIME: String = BuildConfig.BUILDTIME val VERSION_DESCRIPTION_LONG: String = "v$VERSION_NAME ($VERSION_CODE) [$GIT_SHA] ${FLAVOR}_$BUILD_TYPE" val VERSION_DESCRIPTION_SHORT: String = "v$VERSION_NAME [$GIT_SHA] $FLAVOR" diff --git a/app-wear/build.gradle.kts b/app-wear/build.gradle.kts index 652a9f96..ef43b79f 100644 --- a/app-wear/build.gradle.kts +++ b/app-wear/build.gradle.kts @@ -9,7 +9,7 @@ apply(plugin = "androidx.navigation.safeargs.kotlin") android { compileSdk = ProjectConfig.compileSdk - namespace = "${ProjectConfig.packageName}" + namespace = ProjectConfig.packageName defaultConfig { applicationId = ProjectConfig.packageName @@ -23,7 +23,6 @@ android { testInstrumentationRunner = "eu.darken.capod.HiltTestRunner" buildConfigField("String", "GITSHA", "\"${lastCommitHash()}\"") - buildConfigField("String", "BUILDTIME", "\"${buildTime()}\"") } signingConfigs { diff --git a/buildSrc/src/main/java/ProjectConfig.kt b/buildSrc/src/main/java/ProjectConfig.kt index fe366985..68300d36 100644 --- a/buildSrc/src/main/java/ProjectConfig.kt +++ b/buildSrc/src/main/java/ProjectConfig.kt @@ -1,6 +1,5 @@ import java.io.File import java.io.FileInputStream -import java.time.Instant import java.util.Properties object ProjectConfig { @@ -35,8 +34,6 @@ fun lastCommitHash(): String = Runtime.getRuntime().exec("git rev-parse --short output.trim() } -fun buildTime(): Instant = Instant.now() - fun com.android.build.api.dsl.SigningConfig.setupCredentials( signingPropsPath: File? = null ) {