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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
# Java class files
*.class

# Kotlin
.kotlin

# Generated files
bin/
gen/
Expand Down
14 changes: 8 additions & 6 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,8 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = libs.versions.jvmTarget.get()
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

lint {
Expand All @@ -54,6 +50,12 @@ android {
}
}

kotlin {
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
}
}

dependencies {
implementation(project(":colorpickerview"))

Expand Down
3 changes: 1 addition & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.skydoves.colorpickerviewdemo">
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

Expand Down
14 changes: 8 additions & 6 deletions benchmark/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,8 @@ android {
compileSdk = Configuration.compileSdk

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = libs.versions.jvmTarget.get()
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

defaultConfig {
Expand Down Expand Up @@ -50,6 +46,12 @@ baselineProfile {
useConnectedDevices = false
}

kotlin {
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
}
}

dependencies {
implementation(libs.androidx.test.runner)
implementation(libs.androidx.test.uiautomator)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class BaselineProfileGenerator {

@Test
fun startup() = baselineProfileRule.collect(
packageName = packageName,
packageName = PACKAGE_NAME,
stableIterations = 2,
maxIterations = 8,
) {
Expand All @@ -42,4 +42,4 @@ class BaselineProfileGenerator {
}
}

private const val packageName = "com.skydoves.colorpickerviewdemo"
private const val PACKAGE_NAME = "com.skydoves.colorpickerviewdemo"
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ plugins {
alias(libs.plugins.nexus.plugin)
alias(libs.plugins.spotless)
alias(libs.plugins.dokka)
alias(libs.plugins.kotlin.binary.compatibility)
}

subprojects {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
package com.skydoves.colorpicker

object Configuration {
const val compileSdk = 34
const val targetSdk = 34
const val minSdk = 17
const val compileSdk = 35
const val targetSdk = 35
const val minSdk = 21
const val minSdkBenchmark = 23
const val majorVersion = 2
const val minorVersion = 3
Expand Down
17 changes: 12 additions & 5 deletions colorpickerview/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,22 @@ android {
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = libs.versions.jvmTarget.get()
resourcePrefix = "colorpickerview"
}

kotlin {
compilerOptions {
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
}

resourcePrefix = "colorpickerview"
@OptIn(org.jetbrains.kotlin.gradle.dsl.abi.ExperimentalAbiValidation::class)
abiValidation {
enabled.set(true)
}
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion colorpickerview/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<manifest package="com.skydoves.colorpickerview"/>
<manifest />
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,6 @@ POM_DEVELOPER_NAME=Jaewoong Eum
POM_DEVELOPER_URL=https://github.com/skydoves/
POM_DEVELOPER_EMAIL=skydoves2@gmail.com

SONATYPE_HOST=DEFAULT
SONATYPE_HOST=CENTRAL_PORTAL
RELEASE_SIGNING_ENABLED=true
SONATYPE_AUTOMATIC_RELEASE=true
30 changes: 15 additions & 15 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
[versions]
agp = "8.2.2"
dokka = "1.9.20"
kotlin = "2.0.0"
kotlinBinaryCompatibility = "0.14.0"
jvmTarget = "11"
nexusPlugin = "0.28.0"
androidxMaterial = "1.9.0"
androidxAppcompat = "1.6.1"
androidxMacroBenchmark = "1.2.4"
androidxTest = "1.6.2"
baselineProfiles = "1.3.1"
agp = "8.13.2"
dokka = "2.1.0"
kotlin = "2.3.0"
kotlinBinaryCompatibility = "0.18.1"
jvmTarget = "17"
nexusPlugin = "0.35.0"
androidxMaterial = "1.13.0"
androidxAppcompat = "1.7.1"
androidxMacroBenchmark = "1.4.1"
androidxTest = "1.7.0"
baselineProfiles = "1.4.1"
uiAutomator = "2.3.0"
spotless = "6.21.0"
spotless = "8.1.0"
powerMenu = "2.2.4"
timber = "5.0.1"
junit = "1.1.5"
espresso-core = "3.6.1"
junit = "1.3.0"
espresso-core = "3.7.0"

[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }
Expand All @@ -40,4 +40,4 @@ androidx-profileinstaller = { module = "androidx.profileinstaller:profileinstall
androidx-benchmark-macro = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "androidxMacroBenchmark" }
androidx-test-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "uiAutomator" }
junit = { group = "androidx.test.ext", name = "junit", version.ref = "junit" }
espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" }
espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espresso-core" }
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
29 changes: 17 additions & 12 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.