Skip to content

Commit 4fdb999

Browse files
authored
Merge pull request #12 from Mr-Pine/development
Version 1.2
2 parents 7b25465 + 36a3ed1 commit 4fdb999

21 files changed

+322
-359
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,5 @@
1515
local.properties
1616
/SecretRingKey.gpg
1717
/secring.gpg
18+
/zoomables_testing
19+
/buildSrc/src/main/kotlin/myPublishData.kt

.idea/gradle.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle

Lines changed: 0 additions & 18 deletions
This file was deleted.

build.gradle.kts

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2+
plugins {
3+
alias(libs.plugins.android.application) apply false
4+
alias(libs.plugins.android.library) apply false
5+
alias(libs.plugins.dokka) apply false
6+
kotlin("android") version libs.versions.kotlin.get() apply false
7+
id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
8+
}
9+
10+
tasks.create<Delete>("clean") {
11+
delete(rootProject.buildDir)
12+
}
13+
14+
nexusPublishing {
15+
this.repositories {
16+
sonatype {
17+
stagingProfileId.set(publishData.sonatypeStagingProfileId)
18+
username.set(publishData.ossrh.username)
19+
password.set(publishData.ossrh.password)
20+
nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
21+
snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
22+
}
23+
}
24+
}

buildSrc/build.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
plugins {
2+
`kotlin-dsl`
3+
}
4+
5+
repositories {
6+
mavenCentral()
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
data class PublishData(val signing: Signing, val artifact: Artifact, val ossrh: OSSRH, val sonatypeStagingProfileId: String)
2+
3+
data class Signing(val keyname: String, val passphrase: String, val executable: String)
4+
5+
data class Artifact(val group: String, val version: String, val id: String)
6+
7+
data class OSSRH(val username: String, val password: String)
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
val artifact = Artifact(
2+
group = "de.mr-pine.utils",
3+
id = "zoomables",
4+
version = "1.2.0"
5+
)

gradle/libs.versions.toml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[versions]
2+
composeCompiler = "1.4.4"
3+
compose = "1.4.0"
4+
ktx = "1.9.0"
5+
library = "7.4.2"
6+
application = "7.4.2"
7+
kotlin = "1.8.10"
8+
9+
[libraries]
10+
androidx-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "ktx" }
11+
compose-ui = { group = "androidx.compose.ui", name = "ui", version.ref = "compose" }
12+
compose-ui-util = { group = "androidx.compose.ui", name = "ui-util", version.ref = "compose" }
13+
compose-material = { group = "androidx.compose.material", name = "material", version.ref = "compose" }
14+
15+
[plugins]
16+
android-library = { id = "com.android.library", version.ref = "library" }
17+
android-application = { id = "com.android.application", version.ref = "application" }
18+
dokka = { id = "org.jetbrains.dokka", version.ref = "kotlin" }
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Mar 02 00:37:49 CET 2022
1+
#Mon Mar 27 16:36:42 CEST 2023
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-rc-1-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)