-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- 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.1
- Loading branch information
Showing
16 changed files
with
206 additions
and
216 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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") |
9 changes: 4 additions & 5 deletions
9
buildSrc/src/main/kotlin/com/holix/android/bottomsheetdialog/compose/Configuration.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,13 @@ | ||
package com.holix.android.bottomsheetdialog.compose | ||
|
||
object Configuration { | ||
const val compileSdk = 33 | ||
const val targetSdk = 33 | ||
const val compileSdk = 34 | ||
const val targetSdk = 34 | ||
const val minSdk = 21 | ||
const val majorVersion = 1 | ||
const val minorVersion = 2 | ||
const val patchVersion = 2 | ||
const val patchVersion = 3 | ||
const val versionName = "$majorVersion.$minorVersion.$patchVersion" | ||
const val versionCode = 122 | ||
const val snapshotVersionName = "$majorVersion.$minorVersion.${patchVersion + 1}-SNAPSHOT" | ||
const val versionCode = 123 | ||
const val artifactGroup = "com.holix.android" | ||
} |
38 changes: 0 additions & 38 deletions
38
buildSrc/src/main/kotlin/com/holix/android/bottomsheetdialog/compose/Versions.kt
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.