Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android {
namespace = "com.skydoves.colorpickerviewdemo"
defaultConfig {
applicationId = "com.skydoves.colorpickerviewdemo"
minSdk = Configuration.minSdk
minSdk = Configuration.minSdkDemo
targetSdk = Configuration.targetSdk
versionCode = Configuration.versionCode
versionName = Configuration.versionName
Expand Down
2 changes: 1 addition & 1 deletion benchmark/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ android {

targetProjectPath = ":app"

testOptions.managedDevices.devices {
testOptions.managedDevices.allDevices {
maybeCreate<com.android.build.api.dsl.ManagedVirtualDevice>("pixel6api31").apply {
device = "Pixel 6"
apiLevel = 31
Expand Down
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ subprojects {
configure<com.diffplug.gradle.spotless.SpotlessExtension> {
java {
target("**/*.java")
targetExclude("$buildDir/**/*.java")
targetExclude("${layout.buildDirectory.get().asFile.path}/**/*.java")
licenseHeaderFile(rootProject.file("spotless/copyright.kt"))
trimTrailingWhitespace()
endWithNewline()
}
kotlin {
target("**/*.kt")
targetExclude("$buildDir/**/*.kt")
targetExclude("${layout.buildDirectory.get().asFile.path}/**/*.kt")
ktlint().editorConfigOverride(
mapOf(
"indent_size" to "2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
package com.skydoves.colorpicker

object Configuration {
const val compileSdk = 35
const val targetSdk = 35
const val compileSdk = 36
const val targetSdk = 36
const val minSdk = 21
const val minSdkDemo = 23
const val minSdkBenchmark = 23
const val majorVersion = 2
const val minorVersion = 4
Expand Down
3 changes: 2 additions & 1 deletion colorpickerview/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,10 @@ kotlin {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
}

// calling this block enables the ABI validation for the main variant.
@OptIn(org.jetbrains.kotlin.gradle.dsl.abi.ExperimentalAbiValidation::class)
abiValidation {
enabled.set(true)
referenceDumpDir.set(layout.projectDirectory.dir("api"))
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,12 @@ package com.skydoves.colorpickerview.kotlin
import android.content.Context
import com.skydoves.colorpickerview.ColorPickerDialog

@DslMarker
internal annotation class ColorPickerDsl

/**
* Creates a lambda scope for implementing [ColorPickerDialog] using its [ColorPickerDialog.Builder].
*
* @param block lambda scope for receiving [ColorPickerDialog.Builder].
* @return new instance of [ColorPickerDialog].
*/
@JvmSynthetic
@ColorPickerDsl
inline fun Context.colorPickerDialog(block: ColorPickerDialog.Builder.() -> Unit) =
ColorPickerDialog.Builder(this).apply(block)
16 changes: 8 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
[versions]
agp = "8.13.2"
dokka = "2.1.0"
kotlin = "2.3.10"
dokka = "2.2.0"
kotlin = "2.4.20"
kotlinBinaryCompatibility = "0.18.1"
jvmTarget = "17"
nexusPlugin = "0.36.0"
androidxMaterial = "1.13.0"
androidxAppcompat = "1.7.1"
androidxMacroBenchmark = "1.4.1"
nexusPlugin = "0.37.0"
androidxMaterial = "1.14.0"
androidxAppcompat = "1.8.0"
androidxMacroBenchmark = "1.5.0"
androidxTest = "1.7.0"
baselineProfiles = "1.4.1"
uiAutomator = "2.3.0"
spotless = "8.2.1"
uiAutomator = "2.4.0"
spotless = "8.9.0"
powerMenu = "2.2.4"
timber = "5.0.1"
junit = "1.3.0"
Expand Down
Loading