Skip to content

Commit

Permalink
Merge pull request #12 from Mr-Pine/development
Browse files Browse the repository at this point in the history
Version 1.2
  • Loading branch information
Mr-Pine authored Mar 29, 2023
2 parents 7b25465 + 36a3ed1 commit 4fdb999
Show file tree
Hide file tree
Showing 21 changed files with 322 additions and 359 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@
local.properties
/SecretRingKey.gpg
/secring.gpg
/zoomables_testing
/buildSrc/src/main/kotlin/myPublishData.kt
3 changes: 3 additions & 0 deletions .idea/gradle.xml

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

2 changes: 1 addition & 1 deletion .idea/misc.xml

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

18 changes: 0 additions & 18 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 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.dokka) apply false
kotlin("android") version libs.versions.kotlin.get() apply false
id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
}

tasks.create<Delete>("clean") {
delete(rootProject.buildDir)
}

nexusPublishing {
this.repositories {
sonatype {
stagingProfileId.set(publishData.sonatypeStagingProfileId)
username.set(publishData.ossrh.username)
password.set(publishData.ossrh.password)
nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
}
}
}
7 changes: 7 additions & 0 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
plugins {
`kotlin-dsl`
}

repositories {
mavenCentral()
}
7 changes: 7 additions & 0 deletions buildSrc/src/main/kotlin/PublishData.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
data class PublishData(val signing: Signing, val artifact: Artifact, val ossrh: OSSRH, val sonatypeStagingProfileId: String)

data class Signing(val keyname: String, val passphrase: String, val executable: String)

data class Artifact(val group: String, val version: String, val id: String)

data class OSSRH(val username: String, val password: String)
5 changes: 5 additions & 0 deletions buildSrc/src/main/kotlin/artifact.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
val artifact = Artifact(
group = "de.mr-pine.utils",
id = "zoomables",
version = "1.2.0"
)
18 changes: 18 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[versions]
composeCompiler = "1.4.4"
compose = "1.4.0"
ktx = "1.9.0"
library = "7.4.2"
application = "7.4.2"
kotlin = "1.8.10"

[libraries]
androidx-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "ktx" }
compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "compose" }
compose-ui-util = { group = "androidx.compose.ui", name = "ui-util", version.ref = "compose" }
compose-material = { group = "androidx.compose.material", name = "material", version.ref = "compose" }

[plugins]
android-library = { id = "com.android.library", version.ref = "library" }
android-application = { id = "com.android.application", version.ref = "application" }
dokka = { id = "org.jetbrains.dokka", version.ref = "kotlin" }
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Mar 02 00:37:49 CET 2022
#Mon Mar 27 16:36:42 CEST 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-rc-1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
92 changes: 0 additions & 92 deletions scripts/publish-module.gradle

This file was deleted.

34 changes: 0 additions & 34 deletions scripts/publish-root.gradle

This file was deleted.

3 changes: 2 additions & 1 deletion settings.gradle → settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ dependencyResolutionManagement {
}
}
rootProject.name = "Zoomables Library"
include ':zoomables'
include(":zoomables")
include(":zoomables_testing")
82 changes: 0 additions & 82 deletions zoomables/build.gradle

This file was deleted.

Loading

0 comments on commit 4fdb999

Please sign in to comment.