Skip to content

Commit

Permalink
Fix closedSigningRepository bug
Browse files Browse the repository at this point in the history
  • Loading branch information
behzodhalil committed Apr 26, 2023
1 parent e2433f4 commit 80adb2a
Show file tree
Hide file tree
Showing 16 changed files with 83 additions and 97 deletions.
1 change: 0 additions & 1 deletion .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ jobs:
- uses: ./.github/workflows/gradle-caches
with:
key-prefix: gradle-lint

- name: Ktlint
run: ./gradlew ktlintCheck --scan
build:
Expand Down
82 changes: 42 additions & 40 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,42 +1,44 @@
buildscript {
ext {
compose_ui_version = '1.4.1'
ext {
compose_ui_version = '1.4.1'
}
repositories {
google()
mavenCentral()
maven {
url "https://jitpack.io"
}
repositories {
google()
mavenCentral()
maven {
url "https://jitpack.io"
}
maven {
url "https://s01.oss.sonatype.org/"
}
maven {
url "https://oss.sonatype.org/content/repositories/snapshots"
}
maven {
url "https://s01.oss.sonatype.org/"
}
dependencies {
classpath("org.jlleitschuh.gradle:ktlint-gradle:10.1.0")
classpath "com.diffplug.spotless:spotless-plugin-gradle:6.17.0"
classpath 'io.github.gradle-nexus:publish-plugin:1.2.0'
maven {
url "https://oss.sonatype.org/content/repositories/snapshots"
}
}
dependencies {
classpath("org.jlleitschuh.gradle:ktlint-gradle:10.1.0")
classpath "com.diffplug.spotless:spotless-plugin-gradle:6.17.0"
classpath 'io.github.gradle-nexus:publish-plugin:1.3.0'

}
}
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '7.3.0' apply false
id 'com.android.library' version '7.3.0' apply false
id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
id 'org.jetbrains.kotlin.jvm' version '1.8.0' apply false
id 'org.jlleitschuh.gradle.ktlint' version '10.1.0'
id ("com.diffplug.spotless") version "6.17.0"
id("io.github.gradle-nexus.publish-plugin") version "1.2.0"
id("name.remal.maven-publish-nexus-staging") version "1.5.0"
id 'com.android.application' version '7.3.0' apply false
id 'com.android.library' version '7.3.0' apply false
id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
id 'org.jetbrains.kotlin.jvm' version '1.8.0' apply false
id 'org.jlleitschuh.gradle.ktlint' version '10.1.0'
id("com.diffplug.spotless") version "6.17.0"
id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
id("name.remal.maven-publish-nexus-staging") version "1.5.0"
id("org.jetbrains.dokka") version "1.8.10"
}

tasks.register("installGitHook", Copy) {
from new File(projectDir, 'tools/git-hooks/pre-commit')
into { new File(projectDir, '.git/hooks') }
fileMode 0777
from new File(projectDir, 'tools/git-hooks/pre-commit')
into { new File(projectDir, '.git/hooks') }
fileMode 0777
}

subprojects {
Expand All @@ -47,18 +49,18 @@ tasks.getByPath(":app:preBuild").dependsOn(":installGitHook")


ktlint {
debug.set(false)
verbose.set(true)
android.set(true)
outputToConsole.set(true)
ignoreFailures.set(false)
enableExperimentalRules.set(true)
additionalEditorconfigFile.set(file("$rootDir/.editorconfig"))
debug.set(false)
verbose.set(true)
android.set(true)
outputToConsole.set(true)
ignoreFailures.set(false)
enableExperimentalRules.set(true)
additionalEditorconfigFile.set(file("$rootDir/.editorconfig"))

filter {
exclude("**/generated/**")
include("**/kotlin/**")
}
filter {
exclude("**/generated/**")
include("**/kotlin/**")
}
}

apply from: "${rootDir}/tools/scripts/publish-root.gradle"
5 changes: 3 additions & 2 deletions buildable-annotations/factory-core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
plugins {
id 'org.jetbrains.kotlin.jvm'
id 'org.jetbrains.kotlin.jvm'
}


ext {
set("PUBLISH_GROUP_ID", "io.github.behzodhalil")
set("PUBLISH_ARTIFACT_ID", "buildable-factory-core")
set("PUBLISH_VERSION", "1.0.1")
set("PUBLISH_VERSION", "1.1.0")
}

apply from: "${rootDir}/tools/scripts/publish-module.gradle"

2 changes: 1 addition & 1 deletion buildable-annotations/mapper-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
ext {
set("PUBLISH_GROUP_ID", "io.github.behzodhalil")
set("PUBLISH_ARTIFACT_ID", "buildable-mapper-core")
set("PUBLISH_VERSION", "1.0.1")
set("PUBLISH_VERSION", "1.1.0")
}

apply from: "${rootDir}/tools/scripts/publish-module.gradle"
1 change: 0 additions & 1 deletion buildable-processors/.gitignore

This file was deleted.

10 changes: 0 additions & 10 deletions buildable-processors/build.gradle

This file was deleted.

Empty file.
2 changes: 1 addition & 1 deletion buildable-processors/factory/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
ext {
set("PUBLISH_GROUP_ID", "io.github.behzodhalil")
set("PUBLISH_ARTIFACT_ID", "buildable-factory")
set("PUBLISH_VERSION", "1.0.0")
set("PUBLISH_VERSION", "1.1.0")
}

apply from: "${rootDir}/tools/scripts/publish-module.gradle"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
io.spherelabs.factory.BuildableFactoryProcessorProvider
4 changes: 3 additions & 1 deletion buildable-processors/mapper/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
ext {
set("PUBLISH_GROUP_ID", "io.github.behzodhalil")
set("PUBLISH_ARTIFACT_ID", "buildable-mapper")
set("PUBLISH_VERSION", "1.0.0")
set("PUBLISH_VERSION", "1.1.0")
}

apply from: "${rootDir}/tools/scripts/publish-module.gradle"
Expand All @@ -16,3 +16,5 @@ dependencies {
implementation 'com.squareup:kotlinpoet-ksp:1.12.0'
implementation 'com.google.devtools.ksp:symbol-processing-api:1.8.10-1.0.9'
}


21 changes: 0 additions & 21 deletions buildable-processors/proguard-rules.pro

This file was deleted.

4 changes: 0 additions & 4 deletions buildable-processors/src/main/AndroidManifest.xml

This file was deleted.

This file was deleted.

3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ kotlin.code.style=official
# Enables namespacing of each library's R class so that its R class includes only the
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
android.nonTransitiveRClass=true
org.gradle.caching=true
25 changes: 14 additions & 11 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
pluginManagement {
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
repositories {
google()
mavenCentral()
gradlePluginPortal()
maven { url 'https://jitpack.io' }
maven { url "https://plugins.gradle.org/m2/" }
}
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
maven { url 'https://jitpack.io' }
}
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
maven { url 'https://jitpack.io' }
maven { url "https://plugins.gradle.org/m2/" }
}
}
rootProject.name = "buildable"
include ':app'
Expand Down
18 changes: 16 additions & 2 deletions tools/scripts/publish-module.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
apply plugin: 'maven-publish'
apply plugin: 'signing'
apply plugin: 'org.jetbrains.dokka'

task androidSourcesJar(type: Jar) {
archiveClassifier.set('sources')
Expand All @@ -12,14 +13,26 @@ task androidSourcesJar(type: Jar) {
}
}

tasks.withType(dokkaHtmlPartial.getClass()).configureEach {
pluginsMapConfiguration.set(
["org.jetbrains.dokka.base.DokkaBase": """{ "separateInheritedMembers": true}"""]
)
}

task javadocJar(type: Jar, dependsOn: dokkaJavadoc) {
archiveClassifier.set('javadoc')
from dokkaJavadoc.outputDirectory
}


artifacts {
archives androidSourcesJar
archives javadocJar
}

group = PUBLISH_GROUP_ID
version = PUBLISH_VERSION


afterEvaluate {
publishing {
publications {
Expand All @@ -34,10 +47,11 @@ afterEvaluate {
}

artifact androidSourcesJar
artifact javadocJar

pom {
name = PUBLISH_ARTIFACT_ID
description = 'Buildable is a code generation too'
description = 'Buildable is a code generation tool'
url = 'https://github.com/getspherelabs/buildable'
licenses {
license {
Expand Down

0 comments on commit 80adb2a

Please sign in to comment.