diff --git a/base/build.gradle b/base/build.gradle index 99e12b36..709ef386 100644 --- a/base/build.gradle +++ b/base/build.gradle @@ -15,10 +15,6 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - buildFeatures { - buildConfig true - } - buildTypes { release { minifyEnabled false @@ -60,11 +56,6 @@ dependencies { //noinspection GradleDependency coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:$desugarLibVersion" - def emoji2Version = "1.3.0" - def lifecycleVersion = "2.6.1" - def startupVersion = "1.1.1" - def workVersion = "2.8.1" - api "androidx.appcompat:appcompat:$appcompatVersion" api "androidx.browser:browser:1.5.0" api "androidx.core:core-ktx:$coreKtxVersion" @@ -92,7 +83,7 @@ dependencies { api "com.github.kenglxn.QRGen:android:2.5.0" api "com.github.omadahealth:swipy:1.2.3@aar" api "com.github.woxthebox:draglistview:1.6.6" - api "com.google.android.exoplayer:exoplayer:2.18.5" + api "com.google.android.exoplayer:exoplayer:$exoplayerVersion" api "com.google.android.flexbox:flexbox:3.0.0" api "com.google.android.material:material:$materialVersion" api "com.otaliastudios:transcoder:0.10.4" diff --git a/base/src/debug/java/jp/juggler/base/IsDebugBuild.kt b/base/src/debug/java/jp/juggler/base/IsDebugBuild.kt new file mode 100644 index 00000000..ec6ce8fe --- /dev/null +++ b/base/src/debug/java/jp/juggler/base/IsDebugBuild.kt @@ -0,0 +1,4 @@ +package jp.juggler.base + +const val IS_DEBUG_BUILD = true +const val IS_RELEASE_BUILD = !IS_DEBUG_BUILD diff --git a/base/src/main/java/jp/juggler/util/log/Benchmark.kt b/base/src/main/java/jp/juggler/util/log/Benchmark.kt index 9af7663e..75becd35 100644 --- a/base/src/main/java/jp/juggler/util/log/Benchmark.kt +++ b/base/src/main/java/jp/juggler/util/log/Benchmark.kt @@ -1,11 +1,11 @@ package jp.juggler.util.log import android.os.SystemClock -import jp.juggler.base.BuildConfig +import jp.juggler.base.IS_DEBUG_BUILD val benchmarkLog = LogCategory("Benchmark") -val benchmarkLimitDefault = if (BuildConfig.DEBUG) 10L else 100L +val benchmarkLimitDefault = if (IS_DEBUG_BUILD) 10L else 100L inline fun benchmark( caption: String, diff --git a/base/src/release/java/jp/juggler/base/IsDebugBuild.kt b/base/src/release/java/jp/juggler/base/IsDebugBuild.kt new file mode 100644 index 00000000..da023bc6 --- /dev/null +++ b/base/src/release/java/jp/juggler/base/IsDebugBuild.kt @@ -0,0 +1,4 @@ +package jp.juggler.base + +const val IS_DEBUG_BUILD = false +const val IS_RELEASE_BUILD = !IS_DEBUG_BUILD diff --git a/build.gradle b/build.gradle index a30c473d..a4f0327d 100644 --- a/build.gradle +++ b/build.gradle @@ -13,16 +13,19 @@ buildscript { ext.coreKtxVersion = "1.10.0" ext.desugarLibVersion = "1.2.0" ext.detektVersion = "1.22.0" + ext.emoji2Version = "1.3.0" + ext.exoplayerVersion = "2.18.6" ext.glideVersion = "4.14.2" ext.javaSourceCompatibility = JavaVersion.VERSION_1_8 ext.javaTargetCompatibility = JavaVersion.VERSION_1_8 ext.junitVersion = "4.13.2" ext.koinVersion = "3.3.3" - ext.kotlinJvmToolchain = 17 ext.kotlinJvmTarget = "1.8" + ext.kotlinJvmToolchain = 17 ext.kotlinVersion = "1.8.20" ext.kotlinxCoroutinesVersion = "1.6.4" ext.kspVersion = "1.8.20-1.0.11" + ext.lifecycleVersion = "2.6.1" ext.materialVersion = "1.8.0" ext.okhttpVersion = "4.10.0" ext.preferenceVersion = "1.2.0" @@ -30,7 +33,9 @@ buildscript { ext.stCompileSdkVersion = 33 ext.stMinSdkVersion = 26 ext.stTargetSdkVersion = 33 + ext.startupVersion = "1.1.1" ext.testKtxVersion = "1.5.0" + ext.workVersion = "2.8.1" repositories { google()