Skip to content

Commit

Permalink
feat: refactored and switch to material3
Browse files Browse the repository at this point in the history
  • Loading branch information
ch4rl3x committed Apr 17, 2024
1 parent 7e919fb commit 13273c6
Show file tree
Hide file tree
Showing 25 changed files with 457 additions and 551 deletions.
2 changes: 1 addition & 1 deletion .idea/compiler.xml

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

10 changes: 10 additions & 0 deletions .idea/deploymentTargetSelector.xml

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

6 changes: 6 additions & 0 deletions .idea/kotlinc.xml

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

10 changes: 10 additions & 0 deletions .idea/migrations.xml

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

3 changes: 2 additions & 1 deletion .idea/misc.xml

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

2 changes: 1 addition & 1 deletion _ktlint.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ configurations {
}

dependencies {
ktlint "com.pinterest:ktlint:0.42.1"
ktlint libs.ktlint
}

task ktlint(type: JavaExec, group: "verification") {
Expand Down
4 changes: 2 additions & 2 deletions _publish.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ publishing {

// Two artifacts, the `aar` (or `jar`) and the sources
if (project.plugins.findPlugin("com.android.library")) {
artifact("$buildDir/outputs/aar/${project.getName()}-release.aar")
artifact("${getLayout().buildDirectory}/outputs/aar/${project.getName()}-release.aar")
} else {
artifact("$buildDir/libs/${project.getName()}-${version}.jar")
artifact("${getLayout().buildDirectory}/libs/${project.getName()}-${version}.jar")
}
artifact androidSourcesJar

Expand Down
19 changes: 10 additions & 9 deletions bottom-drawer-scaffold/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,20 @@ apply from: '../buildCompose.gradle'

ext {
PUBLISH_GROUP_ID = 'de.charlex.compose'
PUBLISH_VERSION = '1.1.0-beta02'
PUBLISH_VERSION = '2.0.0-alpha01'
PUBLISH_ARTIFACT_ID = 'bottom-drawer-scaffold'
}

apply from: '../_publish.gradle'

android {
compileSdk 30
buildToolsVersion "30.0.3"
namespace 'de.charlex.compose.bottomdrawerscaffold'

compileSdk libs.versions.compileSdk.get() as Integer

defaultConfig {
minSdk 21
targetSdk 30
minSdk libs.versions.minSdk.get() as Integer
targetSdk libs.versions.targetSdk.get() as Integer

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
Expand All @@ -37,15 +38,15 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility libs.versions.javaVersion.get() as Integer
targetCompatibility libs.versions.javaVersion.get() as Integer
}

kotlinOptions {
jvmTarget = '1.8'
jvmTarget = libs.versions.javaVersion.get()
}
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
implementation libs.kotlin.stdlib.jdk8
}
2 changes: 1 addition & 1 deletion bottom-drawer-scaffold/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest package="de.charlex.compose"/>
<manifest package="de.charlex.compose.bottomdrawerscaffold"/>
Loading

0 comments on commit 13273c6

Please # to comment.