Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into publish-maven-central
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/publish.yml
  • Loading branch information
pseudoankit committed Feb 9, 2024
2 parents 4933758 + 9620e21 commit aaf26d0
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 96 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ dependencies {
implementation "androidx.compose.ui:ui-tooling-preview:$compose_ui_version"
implementation "androidx.compose.material:material:$compose_ui_version"

implementation 'io.github.pseudoankit:rating-bar:1.0.0'
implementation 'com.github.pseudoankit:RatingBarCompose:v1.0'

// implementation project(':rating-bar')
// implementation project(':rating-bar')
}
14 changes: 0 additions & 14 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,8 @@ buildscript {

plugins {
id 'org.jetbrains.kotlin.android' version '1.6.10' apply false
id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
}

task clean(type: Delete) {
delete rootProject.buildDir
}

nexusPublishing {
repositories {
sonatype {
username = System.getenv("OSS_USERNAME")
password = System.getenv("OSS_PASSWORD")
stagingProfileId = System.getenv("OSS_STAGING_PROFILE_ID")

nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
}
}
}
75 changes: 0 additions & 75 deletions gradle/publish-package.gradle

This file was deleted.

5 changes: 0 additions & 5 deletions rating-bar/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@ plugins {
id 'org.jetbrains.kotlin.android'
}

apply from: '../gradle/publish-package.gradle'
ext {
ARTIFACT_ID = "rating-bar"
}

android {
namespace 'pseudoankit.droid.rating_bar'
compileSdk 33
Expand Down
1 change: 1 addition & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ dependencyResolutionManagement {
repositories {
google()
mavenCentral()
maven { url 'https://jitpack.io' }
}
}
rootProject.name = "ComposeRatingBar"
Expand Down

0 comments on commit aaf26d0

Please sign in to comment.