Skip to content

Commit

Permalink
Release 1.4.1
Browse files Browse the repository at this point in the history
- 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.7
  • Loading branch information
workspace committed Jan 26, 2024
1 parent ef59af9 commit 72a0e19
Show file tree
Hide file tree
Showing 16 changed files with 203 additions and 213 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v3.1.0
- name: Set up JDK 17
uses: actions/setup-java@v2
uses: actions/setup-java@v3.6.0
with:
distribution: adopt
java-version: 17
Expand Down
59 changes: 0 additions & 59 deletions app/build.gradle

This file was deleted.

59 changes: 59 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
import com.holix.android.bottomsheetdialog.compose.Configuration

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
}

android {
namespace = "com.holix.android.bottomsheetdialogcomposedemo"
compileSdk = Configuration.compileSdk

defaultConfig {
applicationId = "com.holix.android.bottomsheetdialog"
minSdk = Configuration.minSdk
targetSdk = Configuration.targetSdk
versionCode = 1
versionName = "demo-app"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

buildTypes {
release {
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = libs.versions.jvmTarget.get()
}
buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidxComposeCompiler.get()
}

}

dependencies {
implementation(project(":bottomsheetdialog-compose"))
implementation(libs.androidx.core)
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.compose.ui)
debugImplementation(libs.androidx.compose.ui.tooling)
implementation(libs.androidx.compose.ui.tooling.preview)
implementation(libs.androidx.compose.foundation)
implementation(libs.androidx.compose.material)
implementation(libs.androidx.activity.compose)
implementation(libs.material)
implementation(libs.colorPicker.compose)
}
2 changes: 1 addition & 1 deletion app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
# proguardFiles setting in build.gradle.kts.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
Expand Down
62 changes: 0 additions & 62 deletions bottomsheetdialog-compose/build.gradle

This file was deleted.

60 changes: 60 additions & 0 deletions bottomsheetdialog-compose/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import com.holix.android.bottomsheetdialog.compose.Configuration

plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
}

rootProject.extra.apply {
set("PUBLISH_GROUP_ID", Configuration.artifactGroup)
set("PUBLISH_ARTIFACT_ID", "bottomsheetdialog-compose")
set("PUBLISH_VERSION", rootProject.extra.get("rootVersionName"))
}

apply(from = "${rootProject.projectDir}/scripts/publish-module.gradle")

android {
namespace = "com.holix.android.bottomsheetdialog.compose"
compileSdk = Configuration.compileSdk

defaultConfig {
minSdk = Configuration.minSdk
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
}

buildTypes {
release {
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = libs.versions.jvmTarget.get()
}
buildFeatures {
buildConfig = false
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = libs.versions.androidxComposeCompiler.get()
}
}

dependencies {
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.compose.ui)
debugImplementation(libs.androidx.compose.ui.tooling)
implementation(libs.androidx.compose.ui.tooling.preview)
implementation(libs.androidx.compose.foundation)
implementation(libs.androidx.activity)
implementation(libs.androidx.core)
implementation(libs.material)
}
2 changes: 1 addition & 1 deletion bottomsheetdialog-compose/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
# proguardFiles setting in build.gradle.kts.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html
Expand Down
22 changes: 0 additions & 22 deletions build.gradle

This file was deleted.

24 changes: 24 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
apply(plugin = "io.github.gradle-nexus.publish-plugin")

buildscript {
repositories {
google()
mavenCentral()
maven("https://plugins.gradle.org/m2/")
}
}

plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.nexus) apply false
alias(libs.plugins.spotless) apply false
}

tasks.register("clean")
.configure {
delete(rootProject.layout.buildDirectory)
}

apply(from = "${rootDir}/scripts/publish-root.gradle")
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ package com.holix.android.bottomsheetdialog.compose

object Configuration {
const val compileSdk = 34
const val targetSdk = 33
const val targetSdk = 34
const val minSdk = 21
const val majorVersion = 1
const val minorVersion = 4
const val patchVersion = 0
const val patchVersion = 1
const val versionName = "$majorVersion.$minorVersion.$patchVersion"
const val versionCode = 140
const val snapshotVersionName = "$majorVersion.$minorVersion.${patchVersion + 1}-SNAPSHOT"
const val versionCode = 141
const val artifactGroup = "com.holix.android"
}

This file was deleted.

Loading

0 comments on commit 72a0e19

Please sign in to comment.