Skip to content

Commit 1a43423

Browse files
committed
Release 1.3.2
- migrate from groovy to kts - bump gradle to 8.5 - bump kotlin to 1.9.21 - bump androidx activity to 1.8.2 - bump androidx core to 1.12.0 - bump compose compiler to 1.5.7 - bump material to 1.11.0 - bump color picker compose to 1.0.6
1 parent 57d9bde commit 1a43423

File tree

16 files changed

+205
-215
lines changed

16 files changed

+205
-215
lines changed

.github/workflows/publish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Check out code
13-
uses: actions/checkout@v2
14-
- name: Set up JDK 11
15-
uses: actions/setup-java@v2
13+
uses: actions/checkout@v3.1.0
14+
- name: Set up JDK 17
15+
uses: actions/setup-java@v3.6.0
1616
with:
1717
distribution: adopt
18-
java-version: 11
18+
java-version: 17
1919

2020
# Make gradlew executable https://github.com/actions/starter-workflows/issues/171
2121
- name: Make gradlew executable

app/build.gradle

Lines changed: 0 additions & 59 deletions
This file was deleted.

app/build.gradle.kts

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
import com.holix.android.bottomsheetdialog.compose.Configuration
2+
3+
plugins {
4+
alias(libs.plugins.android.application)
5+
alias(libs.plugins.kotlin.android)
6+
}
7+
8+
android {
9+
namespace = "com.holix.android.bottomsheetdialogcomposedemo"
10+
compileSdk = Configuration.compileSdk
11+
12+
defaultConfig {
13+
applicationId = "com.holix.android.bottomsheetdialog"
14+
minSdk = Configuration.minSdk
15+
targetSdk = Configuration.targetSdk
16+
versionCode = 1
17+
versionName = "demo-app"
18+
19+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
20+
}
21+
22+
buildTypes {
23+
release {
24+
isMinifyEnabled = false
25+
proguardFiles(
26+
getDefaultProguardFile("proguard-android-optimize.txt"),
27+
"proguard-rules.pro"
28+
)
29+
}
30+
}
31+
compileOptions {
32+
sourceCompatibility = JavaVersion.VERSION_11
33+
targetCompatibility = JavaVersion.VERSION_11
34+
}
35+
kotlinOptions {
36+
jvmTarget = libs.versions.jvmTarget.get()
37+
}
38+
buildFeatures {
39+
compose = true
40+
}
41+
composeOptions {
42+
kotlinCompilerExtensionVersion = libs.versions.androidxComposeCompiler.get()
43+
}
44+
45+
}
46+
47+
dependencies {
48+
implementation(project(":bottomsheetdialog-compose"))
49+
implementation(libs.androidx.core)
50+
implementation(platform(libs.androidx.compose.bom))
51+
implementation(libs.androidx.compose.ui)
52+
debugImplementation(libs.androidx.compose.ui.tooling)
53+
implementation(libs.androidx.compose.ui.tooling.preview)
54+
implementation(libs.androidx.compose.foundation)
55+
implementation(libs.androidx.compose.material)
56+
implementation(libs.androidx.activity.compose)
57+
implementation(libs.material)
58+
implementation(libs.colorPicker.compose)
59+
}

app/proguard-rules.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Add project specific ProGuard rules here.
22
# You can control the set of applied configuration files using the
3-
# proguardFiles setting in build.gradle.
3+
# proguardFiles setting in build.gradle.kts.
44
#
55
# For more details, see
66
# http://developer.android.com/guide/developing/tools/proguard.html

bottomsheetdialog-compose/build.gradle

Lines changed: 0 additions & 62 deletions
This file was deleted.
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
import com.holix.android.bottomsheetdialog.compose.Configuration
2+
3+
plugins {
4+
alias(libs.plugins.android.library)
5+
alias(libs.plugins.kotlin.android)
6+
}
7+
8+
rootProject.extra.apply {
9+
set("PUBLISH_GROUP_ID", Configuration.artifactGroup)
10+
set("PUBLISH_ARTIFACT_ID", "bottomsheetdialog-compose")
11+
set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName"))
12+
}
13+
14+
apply(from = "${rootProject.projectDir}/scripts/publish-module.gradle")
15+
16+
android {
17+
namespace = "com.holix.android.bottomsheetdialog.compose"
18+
compileSdk = Configuration.compileSdk
19+
20+
defaultConfig {
21+
minSdk = Configuration.minSdk
22+
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
23+
consumerProguardFiles("consumer-rules.pro")
24+
}
25+
26+
buildTypes {
27+
release {
28+
isMinifyEnabled = false
29+
proguardFiles(
30+
getDefaultProguardFile("proguard-android-optimize.txt"),
31+
"proguard-rules.pro"
32+
)
33+
}
34+
}
35+
compileOptions {
36+
sourceCompatibility = JavaVersion.VERSION_11
37+
targetCompatibility = JavaVersion.VERSION_11
38+
}
39+
kotlinOptions {
40+
jvmTarget = libs.versions.jvmTarget.get()
41+
}
42+
buildFeatures {
43+
buildConfig = false
44+
compose = true
45+
}
46+
composeOptions {
47+
kotlinCompilerExtensionVersion = libs.versions.androidxComposeCompiler.get()
48+
}
49+
}
50+
51+
dependencies {
52+
implementation(platform(libs.androidx.compose.bom))
53+
implementation(libs.androidx.compose.ui)
54+
debugImplementation(libs.androidx.compose.ui.tooling)
55+
implementation(libs.androidx.compose.ui.tooling.preview)
56+
implementation(libs.androidx.compose.foundation)
57+
implementation(libs.androidx.activity)
58+
implementation(libs.androidx.core)
59+
implementation(libs.material)
60+
}

bottomsheetdialog-compose/proguard-rules.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Add project specific ProGuard rules here.
22
# You can control the set of applied configuration files using the
3-
# proguardFiles setting in build.gradle.
3+
# proguardFiles setting in build.gradle.kts.
44
#
55
# For more details, see
66
# http://developer.android.com/guide/developing/tools/proguard.html

build.gradle

Lines changed: 0 additions & 22 deletions
This file was deleted.

build.gradle.kts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
apply(plugin = "io.github.gradle-nexus.publish-plugin")
2+
3+
buildscript {
4+
repositories {
5+
google()
6+
mavenCentral()
7+
maven("https://plugins.gradle.org/m2/")
8+
}
9+
}
10+
11+
plugins {
12+
alias(libs.plugins.android.application) apply false
13+
alias(libs.plugins.android.library) apply false
14+
alias(libs.plugins.kotlin.android) apply false
15+
alias(libs.plugins.nexus) apply false
16+
alias(libs.plugins.spotless) apply false
17+
}
18+
19+
tasks.register("clean")
20+
.configure {
21+
delete(rootProject.layout.buildDirectory)
22+
}
23+
24+
apply(from = "${rootDir}/scripts/publish-root.gradle")

buildSrc/src/main/kotlin/com/holix/android/bottomsheetdialog/compose/Configuration.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ package com.holix.android.bottomsheetdialog.compose
22

33
object Configuration {
44
const val compileSdk = 34
5-
const val targetSdk = 33
5+
const val targetSdk = 34
66
const val minSdk = 21
77
const val majorVersion = 1
88
const val minorVersion = 3
9-
const val patchVersion = 1
9+
const val patchVersion = 2
1010
const val versionName = "$majorVersion.$minorVersion.$patchVersion"
11-
const val versionCode = 131
12-
const val snapshotVersionName = "$majorVersion.$minorVersion.${patchVersion + 1}-SNAPSHOT"
11+
const val versionCode = 132
1312
const val artifactGroup = "com.holix.android"
1413
}

0 commit comments

Comments
 (0)