diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e467121a..9df537b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: uses: gradle/actions/setup-gradle@v3 - name: Validate gradle wrapper - uses: gradle/actions/wrapper-validation@v3 + uses: gradle/actions/wrapper-validation@v5 - name: Build Debug run: ./gradlew clean app:assembleDebug @@ -71,26 +71,20 @@ jobs: if: startsWith(github.ref, 'refs/tags/') run: ./gradlew app:assembleRelease app:bundleRelease - - name: Prepare Sonatype Gradle properties - if: startsWith(github.ref, 'refs/tags/') - run: | - echo "${{ secrets.SONATYPE_GPG_FILE }}" > opensource.gpg.asc - gpg -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }}" --batch "opensource.gpg.asc" > "$HOME/.gradle/opensource.gpg" - echo "sonatype.gpg.key=${{ secrets.SONATYPE_GPG_KEY }}" >> ~/.gradle/gradle.properties - echo "sonatype.gpg.password=${{ secrets.SONATYPE_GPG_PASS }}" >> ~/.gradle/gradle.properties - echo "sonatype.gpg.secretKeyRingFile=$HOME/.gradle/opensource.gpg" >> ~/.gradle/gradle.properties - - name: Relase Sonatype if: startsWith(github.ref, 'refs/tags/') run: | ./gradlew build -x test -x lint - ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -Plibrarytypefaceonly --no-configure-on-demand --no-parallel - ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -Plibrarycoreonly --no-configure-on-demand --no-parallel - ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -Plibraryviewsonly --no-configure-on-demand --no-parallel - ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -Plibrarycomposeonly --no-configure-on-demand --no-parallel + ./gradlew :iconics-core:publishToMavenCentral -x test -x lint --no-configure-on-demand --no-parallel + ./gradlew :iconics-typeface-api:publishToMavenCentral -x test -x lint --no-configure-on-demand --no-parallel + ./gradlew :iconics-views:publishToMavenCentral -x test -x lint --no-configure-on-demand --no-parallel + ./gradlew :iconics-compose:publishToMavenCentral -x test -x lint --no-configure-on-demand --no-parallel env: - NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }} - NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }} + ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.NEXUS_USERNAME }} + ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.NEXUS_PASSWORD }} + ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.SIGNING_KEY_ID }} + ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.SIGNING_PRIVATE_KEY }} + ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }} - name: Collect artifacts run: | diff --git a/app/build.gradle b/app/build.gradle index eec26d4b..6293e3ee 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' apply plugin: 'com.mikepenz.aboutlibraries.plugin' apply plugin: 'com.mikepenz.aboutlibraries.plugin.android' -apply from: "../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" /* * Copyright (c) 2020 Mike Penz diff --git a/build.gradle b/build.gradle index 5de8d79f..e225fdb4 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { ext { release = [ - versionName: "5.5.0-b01", + versionName: "5.5.0-rc01", versionCode: 50500 ] @@ -31,24 +31,24 @@ buildscript { ] versions = [ - kotlin : '2.2.21', + kotlin : '2.2.21', androidX : '1.0.0', recyclerView : '1.3.0', material : '1.9.0', - appcompat : '1.7.0', + appcompat : '1.7.1', drawerlayout : '1.1.0', constraintLayout: '2.0.4', cardview : '1.0.0', ktx : [ - core: '1.10.1' + core: '1.17.0' ], - startup : '1.1.1', + startup : '1.2.0', detekt : '1.18.1', - aboutLibraries: '13.1.0', - materialDrawer: '9.0.2', + aboutLibraries : '13.1.0', + materialDrawer : '9.0.2', fastAdapter : '5.7.0', // compose - compose : '1.9.3', + compose : '1.9.3', ] } @@ -61,7 +61,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.9.1' + classpath 'com.android.tools.build:gradle:8.13.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:${versions.kotlin}" classpath "org.jetbrains.compose:compose-gradle-plugin:${versions.compose}" @@ -71,6 +71,10 @@ buildscript { } } +plugins { + id "com.vanniktech.maven.publish" version "0.35.0" +} + allprojects { group "com.mikepenz" @@ -79,6 +83,15 @@ allprojects { mavenCentral() maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } } + + // Disable Javadoc linting for Java 8+ + if (JavaVersion.current().isJava8Compatible()) { + allprojects { + tasks.withType(Javadoc) { + options.addStringOption('Xdoclint:none', '-quiet') + } + } + } } subprojects { diff --git a/community-material-typeface-library/build.gradle b/community-material-typeface-library/build.gradle index 829574e6..47bbd8c4 100644 --- a/community-material-typeface-library/build.gradle +++ b/community-material-typeface-library/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply from: "../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" android { compileSdkVersion setup.compileSdk @@ -26,8 +27,8 @@ android { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 70961 - versionName "7.0.96.1-kotlin" + versionCode Integer.parseInt(project.property("VERSION_CODE")) + versionName project.property("VERSION_NAME") resValue "string", "community_material_version", "${versionName}" } @@ -42,10 +43,7 @@ android { } namespace 'com.mikepenz.iconics.typeface.library.community' } -if (project.hasProperty('pushall') || project.hasProperty('communitymaterialonly')) { - apply from: '../gradle-release.gradle' -} dependencies { - implementation project(':iconics-typeface-api') + api project(':iconics-typeface-api') } diff --git a/community-material-typeface-library/gradle.properties b/community-material-typeface-library/gradle.properties index 5fab9f42..fa1ee91a 100755 --- a/community-material-typeface-library/gradle.properties +++ b/community-material-typeface-library/gradle.properties @@ -16,4 +16,6 @@ POM_NAME=Android-Iconics Community Material Icons Typeface Library POM_ARTIFACT_ID=community-material-typeface -POM_PACKAGING=aar \ No newline at end of file +POM_PACKAGING=aar +VERSION_CODE=70962 +VERSION_NAME=7.0.96.2-kotlin \ No newline at end of file diff --git a/devicon-typeface-library/build.gradle b/devicon-typeface-library/build.gradle index 6b4e9b6a..62a8a995 100644 --- a/devicon-typeface-library/build.gradle +++ b/devicon-typeface-library/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply from: "../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" android { compileSdkVersion setup.compileSdk @@ -26,8 +27,8 @@ android { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 20008 - versionName "2.0.0.8-kotlin" + versionCode Integer.parseInt(project.property("VERSION_CODE")) + versionName project.property("VERSION_NAME") resValue "string", "devicon_version", "${versionName}" } @@ -43,10 +44,7 @@ android { } namespace 'com.mikepenz.iconics.typeface.library.devicon' } -if (project.hasProperty('pushall') || project.hasProperty('DevIcononly')) { - apply from: '../gradle-release.gradle' -} dependencies { - implementation project(':iconics-typeface-api') + api project(':iconics-typeface-api') } diff --git a/devicon-typeface-library/gradle.properties b/devicon-typeface-library/gradle.properties index 373183dd..c6d17b3e 100644 --- a/devicon-typeface-library/gradle.properties +++ b/devicon-typeface-library/gradle.properties @@ -17,3 +17,5 @@ POM_NAME=Android-Iconics DevIcon Typeface Library POM_ARTIFACT_ID=devicon-typeface POM_PACKAGING=aar +VERSION_CODE=20009 +VERSION_NAME=2.0.0.9-kotlin \ No newline at end of file diff --git a/entypo-typeface-library/build.gradle b/entypo-typeface-library/build.gradle index 67ad4908..4ce5c850 100644 --- a/entypo-typeface-library/build.gradle +++ b/entypo-typeface-library/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply from: "../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" android { compileSdkVersion setup.compileSdk @@ -26,8 +27,8 @@ android { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 10008 - versionName "1.0.0.8-kotlin" + versionCode Integer.parseInt(project.property("VERSION_CODE")) + versionName project.property("VERSION_NAME") resValue "string", "entypo_version", "${versionName}" } @@ -43,10 +44,7 @@ android { } namespace 'com.mikepenz.iconics.typeface.library.entypo' } -if (project.hasProperty('pushall') || project.hasProperty('Entypoonly')) { - apply from: '../gradle-release.gradle' -} dependencies { - implementation project(':iconics-typeface-api') + api project(':iconics-typeface-api') } diff --git a/entypo-typeface-library/gradle.properties b/entypo-typeface-library/gradle.properties index 7e27093f..5086834f 100644 --- a/entypo-typeface-library/gradle.properties +++ b/entypo-typeface-library/gradle.properties @@ -17,3 +17,5 @@ POM_NAME=Android-Iconics Entypo Typeface Library POM_ARTIFACT_ID=entypo-typeface POM_PACKAGING=aar +VERSION_CODE=10009 +VERSION_NAME=1.0.0.9-kotlin \ No newline at end of file diff --git a/fontawesome-typeface-library/build.gradle b/fontawesome-typeface-library/build.gradle index 7d294357..129d07a4 100644 --- a/fontawesome-typeface-library/build.gradle +++ b/fontawesome-typeface-library/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply from: "../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" android { compileSdkVersion setup.compileSdk @@ -26,8 +27,8 @@ android { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 51331 - versionName "5.13.3.1-kotlin" + versionCode Integer.parseInt(project.property("VERSION_CODE")) + versionName project.property("VERSION_NAME") resValue "string", "fontawesome_version", "${versionName}" } @@ -43,10 +44,7 @@ android { } namespace 'com.mikepenz.iconics.typeface.library.fontawesome' } -if (project.hasProperty('pushall') || project.hasProperty('fontawesomeonly')) { - apply from: '../gradle-release.gradle' -} dependencies { - implementation project(':iconics-typeface-api') + api project(':iconics-typeface-api') } diff --git a/fontawesome-typeface-library/gradle.properties b/fontawesome-typeface-library/gradle.properties index a88bd384..b264020c 100755 --- a/fontawesome-typeface-library/gradle.properties +++ b/fontawesome-typeface-library/gradle.properties @@ -16,4 +16,6 @@ POM_NAME=Android-Iconics FontAwesome Typeface Library POM_ARTIFACT_ID=fontawesome-typeface -POM_PACKAGING=aar \ No newline at end of file +POM_PACKAGING=aar +VERSION_CODE=51332 +VERSION_NAME=5.13.3.2-kotlin \ No newline at end of file diff --git a/foundation-icons-typeface-library/build.gradle b/foundation-icons-typeface-library/build.gradle index ce491be6..51e90561 100644 --- a/foundation-icons-typeface-library/build.gradle +++ b/foundation-icons-typeface-library/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply from: "../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" android { compileSdkVersion setup.compileSdk @@ -26,8 +27,8 @@ android { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 30008 - versionName "3.0.0.8-kotlin" + versionCode Integer.parseInt(project.property("VERSION_CODE")) + versionName project.property("VERSION_NAME") resValue "string", "foundation_version", "${versionName}" } @@ -43,10 +44,7 @@ android { } namespace 'com.mikepenz.iconics.typeface.library.foundationicons' } -if (project.hasProperty('pushall') || project.hasProperty('FoundationIconsonly')) { - apply from: '../gradle-release.gradle' -} dependencies { - implementation project(':iconics-typeface-api') + api project(':iconics-typeface-api') } diff --git a/foundation-icons-typeface-library/gradle.properties b/foundation-icons-typeface-library/gradle.properties index d0c4c20f..fd0f9774 100644 --- a/foundation-icons-typeface-library/gradle.properties +++ b/foundation-icons-typeface-library/gradle.properties @@ -17,3 +17,5 @@ POM_NAME=Android-Iconics Foundation Icons Typeface Library POM_ARTIFACT_ID=foundation-icons-typeface POM_PACKAGING=aar +VERSION_CODE=30009 +VERSION_NAME=3.0.0.9-kotlin \ No newline at end of file diff --git a/google-material-typeface/google-material-typeface-library/build.gradle b/google-material-typeface/google-material-typeface-library/build.gradle index de31719d..403579d7 100644 --- a/google-material-typeface/google-material-typeface-library/build.gradle +++ b/google-material-typeface/google-material-typeface-library/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply from: "../../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" android { compileSdkVersion setup.compileSdk @@ -27,8 +28,8 @@ android { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 40003 - versionName "4.0.0.3-kotlin" + versionCode Integer.parseInt(project.property("VERSION_CODE")) + versionName project.property("VERSION_NAME") resValue "string", "googlematerial_version", "${versionName}" } @@ -45,10 +46,7 @@ android { abortOnError false } } -if (project.hasProperty('pushall') || project.hasProperty('googlematerialonly')) { - apply from: "$rootDir/gradle-release.gradle" -} dependencies { - implementation project(':iconics-typeface-api') + api project(':iconics-typeface-api') } diff --git a/google-material-typeface/google-material-typeface-library/gradle.properties b/google-material-typeface/google-material-typeface-library/gradle.properties index 7f6d6d9a..a1a277f2 100644 --- a/google-material-typeface/google-material-typeface-library/gradle.properties +++ b/google-material-typeface/google-material-typeface-library/gradle.properties @@ -16,3 +16,5 @@ POM_NAME=Android-Iconics Google Material Typeface Library POM_ARTIFACT_ID=google-material-typeface POM_PACKAGING=aar +VERSION_CODE=40004 +VERSION_NAME=4.0.0.4-kotlin \ No newline at end of file diff --git a/google-material-typeface/google-material-typeface-outlined-library/build.gradle b/google-material-typeface/google-material-typeface-outlined-library/build.gradle index 9bd9d4f3..995c0de3 100644 --- a/google-material-typeface/google-material-typeface-outlined-library/build.gradle +++ b/google-material-typeface/google-material-typeface-outlined-library/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply from: "../../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" android { compileSdkVersion setup.compileSdk @@ -27,8 +28,8 @@ android { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 40002 - versionName "4.0.0.2-kotlin" + versionCode Integer.parseInt(project.property("VERSION_CODE")) + versionName project.property("VERSION_NAME") resValue "string", "googlematerial_version", "${versionName}" } @@ -45,10 +46,7 @@ android { abortOnError false } } -if (project.hasProperty('pushall') || project.hasProperty('googlematerialonly')) { - apply from: "$rootDir/gradle-release.gradle" -} dependencies { - implementation project(':iconics-typeface-api') + api project(':iconics-typeface-api') } diff --git a/google-material-typeface/google-material-typeface-outlined-library/gradle.properties b/google-material-typeface/google-material-typeface-outlined-library/gradle.properties index f0641f7e..556d7c33 100644 --- a/google-material-typeface/google-material-typeface-outlined-library/gradle.properties +++ b/google-material-typeface/google-material-typeface-outlined-library/gradle.properties @@ -16,3 +16,5 @@ POM_NAME=Android-Iconics Google Material Typeface Outlined Library POM_ARTIFACT_ID=google-material-typeface-outlined POM_PACKAGING=aar +VERSION_CODE=40003 +VERSION_NAME=4.0.0.3-kotlin \ No newline at end of file diff --git a/google-material-typeface/google-material-typeface-rounded-library/build.gradle b/google-material-typeface/google-material-typeface-rounded-library/build.gradle index b049fc1c..e02a1fc3 100644 --- a/google-material-typeface/google-material-typeface-rounded-library/build.gradle +++ b/google-material-typeface/google-material-typeface-rounded-library/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply from: "../../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" android { compileSdkVersion setup.compileSdk @@ -27,8 +28,8 @@ android { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 40002 - versionName "4.0.0.2-kotlin" + versionCode Integer.parseInt(project.property("VERSION_CODE")) + versionName project.property("VERSION_NAME") resValue "string", "googlematerial_version", "${versionName}" } @@ -45,10 +46,7 @@ android { abortOnError false } } -if (project.hasProperty('pushall') || project.hasProperty('googlematerialonly')) { - apply from: "$rootDir/gradle-release.gradle" -} dependencies { - implementation project(':iconics-typeface-api') + api project(':iconics-typeface-api') } diff --git a/google-material-typeface/google-material-typeface-rounded-library/gradle.properties b/google-material-typeface/google-material-typeface-rounded-library/gradle.properties index c2ff08fc..d0ca27a5 100644 --- a/google-material-typeface/google-material-typeface-rounded-library/gradle.properties +++ b/google-material-typeface/google-material-typeface-rounded-library/gradle.properties @@ -16,3 +16,5 @@ POM_NAME=Android-Iconics Google Material Typeface Rounded Library POM_ARTIFACT_ID=google-material-typeface-rounded POM_PACKAGING=aar +VERSION_CODE=40003 +VERSION_NAME=4.0.0.3-kotlin \ No newline at end of file diff --git a/google-material-typeface/google-material-typeface-sharp-library/build.gradle b/google-material-typeface/google-material-typeface-sharp-library/build.gradle index fa496848..c0d0ce26 100644 --- a/google-material-typeface/google-material-typeface-sharp-library/build.gradle +++ b/google-material-typeface/google-material-typeface-sharp-library/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply from: "../../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" android { compileSdkVersion setup.compileSdk @@ -27,8 +28,8 @@ android { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 40002 - versionName "4.0.0.2-kotlin" + versionCode Integer.parseInt(project.property("VERSION_CODE")) + versionName project.property("VERSION_NAME") resValue "string", "googlematerial_version", "${versionName}" } @@ -45,10 +46,7 @@ android { abortOnError false } } -if (project.hasProperty('pushall') || project.hasProperty('googlematerialonly')) { - apply from: "$rootDir/gradle-release.gradle" -} dependencies { - implementation project(':iconics-typeface-api') + api project(':iconics-typeface-api') } diff --git a/google-material-typeface/google-material-typeface-sharp-library/gradle.properties b/google-material-typeface/google-material-typeface-sharp-library/gradle.properties index 15ec4663..cdcc288e 100644 --- a/google-material-typeface/google-material-typeface-sharp-library/gradle.properties +++ b/google-material-typeface/google-material-typeface-sharp-library/gradle.properties @@ -16,3 +16,5 @@ POM_NAME=Android-Iconics Google Material Typeface Sharp Library POM_ARTIFACT_ID=google-material-typeface-sharp POM_PACKAGING=aar +VERSION_CODE=40003 +VERSION_NAME=4.0.0.3-kotlin \ No newline at end of file diff --git a/gradle-release.gradle b/gradle-release.gradle index fa674142..7cc01cad 100644 --- a/gradle-release.gradle +++ b/gradle-release.gradle @@ -1,112 +1,21 @@ -apply plugin: 'maven-publish' -apply plugin: 'signing' +apply plugin: 'com.vanniktech.maven.publish' -ext["signing.keyId"] = project.hasProperty('sonatype.gpg.key') ? project.property('sonatype.gpg.key') : System.getenv('SONATYPE_GPG_KEY') -ext["signing.password"] = project.hasProperty('sonatype.gpg.password') ? project.property('sonatype.gpg.password') : System.getenv('SONATYPE_GPG_PASS') -ext["signing.secretKeyRingFile"] = project.hasProperty('sonatype.gpg.secretKeyRingFile') ? project.property('sonatype.gpg.secretKeyRingFile') : System.getenv('SONATYPE_GPG_FILE') +// Configure the maven publish plugin +mavenPublishing { + // Use the new Maven Central Portal (https://central.sonatype.com/) + publishToMavenCentral(true) -@SuppressWarnings("GroovyUnusedDeclaration") -def getRepositoryUsername() { - return project.hasProperty('NEXUS_USERNAME') ? project.property('NEXUS_USERNAME') : System.getenv('NEXUS_USERNAME') -} + // Enable GPG signing for all publications + signAllPublications() -@SuppressWarnings("GroovyUnusedDeclaration") -def getRepositoryPassword() { - return project.hasProperty('NEXUS_PASSWORD') ? project.property('NEXUS_PASSWORD') : System.getenv('NEXUS_PASSWORD') + version = android.defaultConfig.versionName } -afterEvaluate { project -> - if (JavaVersion.current().isJava8Compatible()) { - allprojects { - tasks.withType(Javadoc) { - options.addStringOption('Xdoclint:none', '-quiet') - } - } - } - - task androidJavadocs(type: Javadoc) { - failOnError = false - source = android.sourceSets.main.java.source - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) - } - - task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) { - archiveClassifier = 'javadoc' - from androidJavadocs.destinationDir - } - - task androidSourcesJar(type: Jar) { - archiveClassifier = 'sources' - from android.sourceSets.main.java.source - } - - def pomConfig = { - licenses { - license { - name POM_LICENCE_NAME - url POM_LICENCE_URL - distribution POM_LICENCE_DIST - } - } - developers { - developer { - id POM_DEVELOPER_ID - name POM_DEVELOPER_NAME - email 'mikepenz@gmail.com' - } - } - scm { - url POM_SCM_URL - connection POM_SCM_CONNECTION - developerConnection POM_SCM_DEV_CONNECTION - } - } - - afterEvaluate { - generateMetadataFileForReleasePublication.dependsOn androidSourcesJar - } - - publishing { - publications { - release(MavenPublication) { - from components.release - - groupId GROUP - artifactId POM_ARTIFACT_ID - version android.defaultConfig.versionName - - artifact androidJavadocsJar - - pom.withXml { - asNode().appendNode('name', POM_NAME) - asNode().appendNode('description', POM_DESCRIPTION) - asNode().appendNode('url', POM_SCM_URL) - asNode().children().last() + pomConfig - - // we want dependencies as compile, to ensure they are transitively resolved - if (!POM_ARTIFACT_ID.endsWith("-typeface")) { - asNode().dependencies.'*'.findAll() { it.scope.text() == 'runtime' }.each { it.scope*.value = 'compile' } - } - } - } - } - - repositories { - maven { - name = "sonatype" - def releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/" - def snapshotsRepoUrl = "https://s01.oss.sonatype.org/content/repositories/snapshots/" - url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl - - credentials { - username getRepositoryUsername() - password getRepositoryPassword() - } - } +// Disable Javadoc linting for Java 8+ +if (JavaVersion.current().isJava8Compatible()) { + allprojects { + tasks.withType(Javadoc) { + options.addStringOption('Xdoclint:none', '-quiet') } } } - -signing { - sign publishing.publications -} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index b2c4ad0c..c9efb7e2 100755 --- a/gradle.properties +++ b/gradle.properties @@ -33,6 +33,16 @@ POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mikepenz POM_DEVELOPER_NAME=Mike Penz +POM_DEVELOPER_EMAIL=opensource@mikepenz.dev + +# Maven Central Portal Configuration +# These properties are used by the com.vanniktech.maven.publish plugin +# Set these as environment variables or in your local.properties file: +# - SONATYPE_CENTRAL_USERNAME (or mavenCentralUsername) +# - SONATYPE_CENTRAL_PASSWORD (or mavenCentralPassword) +# - signing.keyId +# - signing.password +# - signing.secretKeyRingFile (or use in-memory key with signing.key) android.useAndroidX=true android.defaults.buildfeatures.buildconfig=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c82..37f853b1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/iconics-compose/build.gradle b/iconics-compose/build.gradle index e313a1ce..faea4240 100644 --- a/iconics-compose/build.gradle +++ b/iconics-compose/build.gradle @@ -18,7 +18,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: "org.jetbrains.compose" apply plugin: "org.jetbrains.kotlin.plugin.compose" -apply from: "../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" version release.versionName @@ -60,10 +61,6 @@ android { ] } } - -} -if (project.hasProperty('pushall') || project.hasProperty('librarycomposeonly')) { - apply from: '../gradle-release.gradle' } dependencies { diff --git a/iconics-core/build.gradle b/iconics-core/build.gradle index a2424ba8..b551cd20 100644 --- a/iconics-core/build.gradle +++ b/iconics-core/build.gradle @@ -18,7 +18,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: "org.jetbrains.compose" apply plugin: "org.jetbrains.kotlin.plugin.compose" -apply from: "../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" version release.versionName @@ -59,7 +60,3 @@ dependencies { implementation "androidx.appcompat:appcompat:$versions.appcompat" implementation(compose.runtime) } - -if (project.hasProperty('pushall') || project.hasProperty('librarycoreonly')) { - apply from: '../gradle-release.gradle' -} diff --git a/iconics-typeface-api/build.gradle b/iconics-typeface-api/build.gradle index de809d37..b8eff91f 100644 --- a/iconics-typeface-api/build.gradle +++ b/iconics-typeface-api/build.gradle @@ -18,7 +18,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: "org.jetbrains.compose" apply plugin: "org.jetbrains.kotlin.plugin.compose" -apply from: "../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" version release.versionName @@ -53,9 +54,6 @@ android { freeCompilerArgs += ["-module-name", POM_ARTIFACT_ID] } } -if (project.hasProperty('pushall') || project.hasProperty('librarytypefaceonly')) { - apply from: '../gradle-release.gradle' -} dependencies { api "androidx.core:core-ktx:$versions.ktx.core" diff --git a/iconics-views/build.gradle b/iconics-views/build.gradle index d9395529..c7fb1582 100644 --- a/iconics-views/build.gradle +++ b/iconics-views/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply from: "../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" version release.versionName @@ -47,10 +48,6 @@ android { kotlinOptions.freeCompilerArgs += ["-module-name", POM_ARTIFACT_ID] } -if (project.hasProperty('pushall') || project.hasProperty('libraryviewsonly')) { - apply from: '../gradle-release.gradle' -} - dependencies { implementation project(':iconics-core') implementation "androidx.appcompat:appcompat:$versions.appcompat" diff --git a/ionicons-typeface-library/build.gradle b/ionicons-typeface-library/build.gradle index 1a54d449..ca14d1f9 100644 --- a/ionicons-typeface-library/build.gradle +++ b/ionicons-typeface-library/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply from: "../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" android { compileSdkVersion setup.compileSdk @@ -26,8 +27,8 @@ android { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 20108 - versionName "2.0.1.8-kotlin" + versionCode Integer.parseInt(project.property("VERSION_CODE")) + versionName project.property("VERSION_NAME") resValue "string", "iconics_version", "${versionName}" } @@ -43,10 +44,7 @@ android { } namespace 'com.mikepenz.iconics.typeface.library.ionicons' } -if (project.hasProperty('pushall') || project.hasProperty('Ioniconsonly')) { - apply from: '../gradle-release.gradle' -} dependencies { - implementation project(':iconics-typeface-api') + api project(':iconics-typeface-api') } diff --git a/ionicons-typeface-library/gradle.properties b/ionicons-typeface-library/gradle.properties index 8cf3283e..3c9c145f 100644 --- a/ionicons-typeface-library/gradle.properties +++ b/ionicons-typeface-library/gradle.properties @@ -17,3 +17,5 @@ POM_NAME=Android-Iconics Ionicons Typeface Library POM_ARTIFACT_ID=ionicons-typeface POM_PACKAGING=aar +VERSION_CODE=20109 +VERSION_NAME=2.0.1.9-kotlin \ No newline at end of file diff --git a/material-design-dx-typeface-library/build.gradle b/material-design-dx-typeface-library/build.gradle index 18c81cb3..740dda11 100644 --- a/material-design-dx-typeface-library/build.gradle +++ b/material-design-dx-typeface-library/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply from: "../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" android { compileSdkVersion setup.compileSdk @@ -26,8 +27,8 @@ android { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 50013 - versionName "5.0.1.3-kotlin" + versionCode Integer.parseInt(project.property("VERSION_CODE")) + versionName project.property("VERSION_NAME") resValue "string", "materialdesigndx_version", "${versionName}" } @@ -43,10 +44,7 @@ android { } namespace 'com.mikepenz.iconics.typeface.library.materialdesigndx' } -if (project.hasProperty('pushall') || project.hasProperty('materialdesigndxonly')) { - apply from: '../gradle-release.gradle' -} dependencies { - implementation project(':iconics-typeface-api') + api project(':iconics-typeface-api') } \ No newline at end of file diff --git a/material-design-dx-typeface-library/gradle.properties b/material-design-dx-typeface-library/gradle.properties index ea095d92..f270284e 100644 --- a/material-design-dx-typeface-library/gradle.properties +++ b/material-design-dx-typeface-library/gradle.properties @@ -16,3 +16,5 @@ POM_NAME=Android-Iconics Material Design Icons DX Typeface Library POM_ARTIFACT_ID=material-design-icons-dx-typeface POM_PACKAGING=aar +VERSION_CODE=50014 +VERSION_NAME=5.0.1.4-kotlin \ No newline at end of file diff --git a/material-design-iconic-typeface-library/build.gradle b/material-design-iconic-typeface-library/build.gradle index 543b6001..e08b67f5 100644 --- a/material-design-iconic-typeface-library/build.gradle +++ b/material-design-iconic-typeface-library/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply from: "../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" android { compileSdkVersion setup.compileSdk @@ -26,8 +27,8 @@ android { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 22009 - versionName "2.2.0.9-kotlin" + versionCode Integer.parseInt(project.property("VERSION_CODE")) + versionName project.property("VERSION_NAME") resValue "string", "materialdesigniconic_version", "${versionName}" } @@ -43,10 +44,7 @@ android { } namespace 'com.mikepenz.iconics.typeface.library.materialdesigniconic' } -if (project.hasProperty('pushall') || project.hasProperty('materialdesigniconiconly')) { - apply from: '../gradle-release.gradle' -} dependencies { - implementation project(':iconics-typeface-api') + api project(':iconics-typeface-api') } diff --git a/material-design-iconic-typeface-library/gradle.properties b/material-design-iconic-typeface-library/gradle.properties index caf43f8f..bd8bfb24 100755 --- a/material-design-iconic-typeface-library/gradle.properties +++ b/material-design-iconic-typeface-library/gradle.properties @@ -16,4 +16,6 @@ POM_NAME=Android-Iconics Material-Design-Iconic Typeface Library POM_ARTIFACT_ID=material-design-iconic-typeface -POM_PACKAGING=aar \ No newline at end of file +POM_PACKAGING=aar +VERSION_CODE=22010 +VERSION_NAME=2.2.0.10-kotlin \ No newline at end of file diff --git a/material-symbols-typeface/material-symbols-typeface-outlined-library/build.gradle b/material-symbols-typeface/material-symbols-typeface-outlined-library/build.gradle index fdeb03fc..c8e8cd39 100644 --- a/material-symbols-typeface/material-symbols-typeface-outlined-library/build.gradle +++ b/material-symbols-typeface/material-symbols-typeface-outlined-library/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply from: "../../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" android { compileSdkVersion setup.compileSdk @@ -26,8 +27,8 @@ android { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 3930 - versionName "0.39.3.0" + versionCode Integer.parseInt(project.property("VERSION_CODE")) + versionName project.property("VERSION_NAME") resValue "string", "materialsymbols_version", "${versionName}" } buildTypes { @@ -38,11 +39,8 @@ android { } namespace 'com.mikepenz.iconics.typeface.library.materialsymbols' } -if (project.hasProperty('pushall') || project.hasProperty('materialsymbolsonly')) { - apply from: "$rootDir/gradle-release.gradle" -} dependencies { - implementation project(':iconics-typeface-api') + api project(':iconics-typeface-api') } diff --git a/material-symbols-typeface/material-symbols-typeface-outlined-library/gradle.properties b/material-symbols-typeface/material-symbols-typeface-outlined-library/gradle.properties index f6b298dc..ae0e83ee 100644 --- a/material-symbols-typeface/material-symbols-typeface-outlined-library/gradle.properties +++ b/material-symbols-typeface/material-symbols-typeface-outlined-library/gradle.properties @@ -16,3 +16,5 @@ POM_NAME=Android-Iconics Material Symbols Typeface Outlined Library POM_ARTIFACT_ID=material-symbols-typeface-outlined POM_PACKAGING=aar +VERSION_CODE=3931 +VERSION_NAME=0.39.3.1 \ No newline at end of file diff --git a/meteocons-typeface-library/build.gradle b/meteocons-typeface-library/build.gradle index 34bade38..730fe4c3 100644 --- a/meteocons-typeface-library/build.gradle +++ b/meteocons-typeface-library/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply from: "../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" android { compileSdkVersion setup.compileSdk @@ -26,8 +27,8 @@ android { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 11008 - versionName "1.1.0.8-kotlin" + versionCode Integer.parseInt(project.property("VERSION_CODE")) + versionName project.property("VERSION_NAME") resValue "string", "meteocons_version", "${versionName}" } @@ -43,10 +44,7 @@ android { } namespace 'com.mikepenz.iconics.typeface.library.meteoconcs' } -if (project.hasProperty('pushall') || project.hasProperty('meteoconsonly')) { - apply from: '../gradle-release.gradle' -} dependencies { - implementation project(':iconics-typeface-api') + api project(':iconics-typeface-api') } diff --git a/meteocons-typeface-library/gradle.properties b/meteocons-typeface-library/gradle.properties index 4e155830..cfa2474c 100755 --- a/meteocons-typeface-library/gradle.properties +++ b/meteocons-typeface-library/gradle.properties @@ -16,4 +16,6 @@ POM_NAME=Android-Iconics Meteocons Typeface Library POM_ARTIFACT_ID=meteocons-typeface -POM_PACKAGING=aar \ No newline at end of file +POM_PACKAGING=aar +VERSION_CODE=11009 +VERSION_NAME=1.1.0.9-kotlin \ No newline at end of file diff --git a/octicons-typeface-library/build.gradle b/octicons-typeface-library/build.gradle index 216368fa..4912441e 100644 --- a/octicons-typeface-library/build.gradle +++ b/octicons-typeface-library/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply from: "../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" android { compileSdkVersion setup.compileSdk @@ -26,8 +27,8 @@ android { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 111009 - versionName "11.1.0.9-kotlin" + versionCode Integer.parseInt(project.property("VERSION_CODE")) + versionName project.property("VERSION_NAME") resValue "string", "octicons_version", "${versionName}" } @@ -43,10 +44,7 @@ android { } namespace 'com.mikepenz.iconics.typeface.library.octicons' } -if (project.hasProperty('pushall') || project.hasProperty('octicons')) { - apply from: '../gradle-release.gradle' -} dependencies { - implementation project(':iconics-typeface-api') + api project(':iconics-typeface-api') } diff --git a/octicons-typeface-library/gradle.properties b/octicons-typeface-library/gradle.properties index 71c10712..44c587b4 100755 --- a/octicons-typeface-library/gradle.properties +++ b/octicons-typeface-library/gradle.properties @@ -16,4 +16,6 @@ POM_NAME=Android-Iconics Octicons Typeface Library POM_ARTIFACT_ID=octicons-typeface -POM_PACKAGING=aar \ No newline at end of file +POM_PACKAGING=aar +VERSION_CODE=111010 +VERSION_NAME=11.1.0.10-kotlin \ No newline at end of file diff --git a/phosphor-typeface-library/build.gradle b/phosphor-typeface-library/build.gradle index 0aeb22d8..b6899123 100644 --- a/phosphor-typeface-library/build.gradle +++ b/phosphor-typeface-library/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply from: "../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" android { compileSdkVersion setup.compileSdk @@ -26,8 +27,8 @@ android { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 10001 - versionName "1.0.0.1-kotlin" + versionCode Integer.parseInt(project.property("VERSION_CODE")) + versionName project.property("VERSION_NAME") resValue "string", "phosphor_version", "${versionName}" } @@ -43,10 +44,7 @@ android { } namespace 'com.mikepenz.iconics.typeface.library.phosphor' } -if (project.hasProperty('pushall') || project.hasProperty('phosphor')) { - apply from: '../gradle-release.gradle' -} dependencies { - implementation project(':iconics-typeface-api') + api project(':iconics-typeface-api') } diff --git a/phosphor-typeface-library/gradle.properties b/phosphor-typeface-library/gradle.properties index 801a6082..1fa5a792 100755 --- a/phosphor-typeface-library/gradle.properties +++ b/phosphor-typeface-library/gradle.properties @@ -15,4 +15,6 @@ # POM_NAME=Android-Iconics Phosphor Typeface Library POM_ARTIFACT_ID=phosphor-typeface -POM_PACKAGING=aar \ No newline at end of file +POM_PACKAGING=aar +VERSION_CODE=10002 +VERSION_NAME=1.0.0.2-kotlin \ No newline at end of file diff --git a/pixeden-7-stroke-typeface-library/build.gradle b/pixeden-7-stroke-typeface-library/build.gradle index 8d4c5944..04fed991 100644 --- a/pixeden-7-stroke-typeface-library/build.gradle +++ b/pixeden-7-stroke-typeface-library/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply from: "../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" android { compileSdkVersion setup.compileSdk @@ -26,8 +27,8 @@ android { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 12006 - versionName "1.2.0.6-kotlin" + versionCode Integer.parseInt(project.property("VERSION_CODE")) + versionName project.property("VERSION_NAME") resValue "string", "pixeden7_version", "${versionName}" } @@ -43,10 +44,7 @@ android { } namespace 'com.mikepenz.iconics.typeface.library.pixeden7stroke' } -if (project.hasProperty('pushall') || project.hasProperty('Pixeden7Strokeonly')) { - apply from: '../gradle-release.gradle' -} dependencies { - implementation project(':iconics-typeface-api') + api project(':iconics-typeface-api') } diff --git a/pixeden-7-stroke-typeface-library/gradle.properties b/pixeden-7-stroke-typeface-library/gradle.properties index bba1df0c..cb13ab80 100644 --- a/pixeden-7-stroke-typeface-library/gradle.properties +++ b/pixeden-7-stroke-typeface-library/gradle.properties @@ -17,3 +17,5 @@ POM_NAME=Android-Iconics Pixeden 7 Stroke Typeface Library POM_ARTIFACT_ID=pixeden-7-stroke-typeface POM_PACKAGING=aar +VERSION_CODE=12007 +VERSION_NAME=1.2.0.7-kotlin \ No newline at end of file diff --git a/release.sh b/release.sh index d2f46c67..79503d78 100755 --- a/release.sh +++ b/release.sh @@ -4,27 +4,31 @@ if [ "$1" = "release" ]; then - ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -Plibrarytypefaceonly - ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -Plibrarycoreonly - ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -Plibraryviewsonly - ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -Plibrarycomposeonly + ./gradlew :iconics-core:publishToMavenCentral -x test -x lint + ./gradlew :iconics-typeface-api:publishToMavenCentral -x test -x lint + ./gradlew :iconics-views:publishToMavenCentral -x test -x lint + ./gradlew :iconics-compose:publishToMavenCentral -x test -x lint - # ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -Pcommunitymaterialonly - # ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -PDevIcononly - # ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -PEntypoonly - # ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -Pfontawesomeonly - # ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -PFoundationIconsonly - # ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -Pgooglematerialonly - # ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -PIoniconsonly - # ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -Pmaterialdesigndxonly - # ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -Pmaterialdesigniconiconly - # ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -Pmaterialsymbolsonly - # ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -Pmeteoconsonly - # ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -Pocticons - # ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -Pphosphor - # ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -PPixeden7Strokeonly - # ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -PTypeiconsonly - # ./gradlew publishReleasePublicationToSonatypeRepository -x test -x lint -Pweathericonsonly + ./gradlew :community-material-typeface-library:publishToMavenCentral -x test -x lint + ./gradlew :devicon-typeface-library:publishToMavenCentral -x test -x lint + ./gradlew :entypo-typeface-library:publishToMavenCentral -x test -x lint + ./gradlew :fontawesome-typeface-library:publishToMavenCentral -x test -x lint + ./gradlew :foundation-icons-typeface-library:publishToMavenCentral -x test -x lint + ./gradlew :google-material-typeface-library:publishToMavenCentral -x test -x lint + ./gradlew :google-material-typeface-outlined-library:publishToMavenCentral -x test -x lint + ./gradlew :google-material-typeface-rounded-library:publishToMavenCentral -x test -x lint + ./gradlew :google-material-typeface-sharp-library:publishToMavenCentral -x test -x lint + ./gradlew :material-symbols-typeface-outlined-library:publishToMavenCentral -x test -x lint + ./gradlew :ionicons-typeface-library:publishToMavenCentral -x test -x lint + ./gradlew :material-design-dx-typeface-library:publishToMavenCentral -x test -x lint + ./gradlew :material-design-iconic-typeface-library:publishToMavenCentral -x test -x lint + ./gradlew :meteocons-typeface-library:publishToMavenCentral -x test -x lint + ./gradlew :octicons-typeface-library:publishToMavenCentral -x test -x lint + ./gradlew :phosphor-typeface-library:publishToMavenCentral -x test -x lint + ./gradlew :pixeden-7-stroke-typeface-library:publishToMavenCentral -x test -x lint + ./gradlew :typeicons-typeface-library:publishToMavenCentral -x test -x lint + ./gradlew :weather-icons-typeface-library:publishToMavenCentral -x test -x lint + ./gradlew :simple-icons-typeface-library:publishToMavenCentral -x test -x lint else echo todo fi \ No newline at end of file diff --git a/simple-icons-typeface-library/build.gradle b/simple-icons-typeface-library/build.gradle index d0f65955..14a800d7 100644 --- a/simple-icons-typeface-library/build.gradle +++ b/simple-icons-typeface-library/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply from: "../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" android { compileSdkVersion setup.compileSdk @@ -26,8 +27,8 @@ android { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 170003 - versionName "17.0.0.3" + versionCode Integer.parseInt(project.property("VERSION_CODE")) + versionName project.property("VERSION_NAME") resValue "string", "Simple_Icons_version", "${versionName}" } @@ -39,11 +40,8 @@ android { } namespace 'com.mikepenz.iconics.typeface.library.simpleicons' } -if (project.hasProperty('pushall') || project.hasProperty('simpleicons')) { - apply from: '../gradle-release.gradle' -} dependencies { - implementation project(':iconics-typeface-api') + api project(':iconics-typeface-api') } diff --git a/simple-icons-typeface-library/gradle.properties b/simple-icons-typeface-library/gradle.properties index f77da134..11c7512a 100644 --- a/simple-icons-typeface-library/gradle.properties +++ b/simple-icons-typeface-library/gradle.properties @@ -16,3 +16,5 @@ POM_NAME=Android-Iconics Simple Icons Typeface Library POM_ARTIFACT_ID=simple-icons-typeface POM_PACKAGING=aar +VERSION_CODE=170004 +VERSION_NAME=17.0.0.4 \ No newline at end of file diff --git a/typeicons-typeface-library/build.gradle b/typeicons-typeface-library/build.gradle index e5981d6b..03d541d6 100644 --- a/typeicons-typeface-library/build.gradle +++ b/typeicons-typeface-library/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply from: "../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" android { compileSdkVersion setup.compileSdk @@ -26,8 +27,8 @@ android { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 20708 - versionName "2.0.7.8-kotlin" + versionCode Integer.parseInt(project.property("VERSION_CODE")) + versionName project.property("VERSION_NAME") resValue "string", "typeicons_version", "${versionName}" } @@ -43,10 +44,7 @@ android { } namespace 'com.mikepenz.iconics.typeface.library.typeicons' } -if (project.hasProperty('pushall') || project.hasProperty('Typeiconsonly')) { - apply from: '../gradle-release.gradle' -} dependencies { - implementation project(':iconics-typeface-api') + api project(':iconics-typeface-api') } diff --git a/typeicons-typeface-library/gradle.properties b/typeicons-typeface-library/gradle.properties index 6364057b..c6812a09 100644 --- a/typeicons-typeface-library/gradle.properties +++ b/typeicons-typeface-library/gradle.properties @@ -17,3 +17,5 @@ POM_NAME=Android-Iconics Typeicons Typeface Library POM_ARTIFACT_ID=typeicons-typeface POM_PACKAGING=aar +VERSION_CODE=20709 +VERSION_NAME=2.0.7.9-kotlin \ No newline at end of file diff --git a/weather-icons-typeface-library/build.gradle b/weather-icons-typeface-library/build.gradle index 334ffafb..28dcdf5c 100644 --- a/weather-icons-typeface-library/build.gradle +++ b/weather-icons-typeface-library/build.gradle @@ -16,7 +16,8 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply from: "../gradle/compile.groovy" +apply from: "$rootDir/gradle/compile.groovy" +apply from: "$rootDir/gradle-release.gradle" android { compileSdkVersion setup.compileSdk @@ -26,8 +27,8 @@ android { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 20108 - versionName "2.0.10.8-kotlin" + versionCode Integer.parseInt(project.property("VERSION_CODE")) + versionName project.property("VERSION_NAME") resValue "string", "weathericons_version", "${versionName}" } @@ -43,10 +44,7 @@ android { } namespace 'com.mikepenz.iconics.typeface.library.weathericons' } -if (project.hasProperty('pushall') || project.hasProperty('weathericonsonly')) { - apply from: '../gradle-release.gradle' -} dependencies { - implementation project(':iconics-typeface-api') + api project(':iconics-typeface-api') } diff --git a/weather-icons-typeface-library/gradle.properties b/weather-icons-typeface-library/gradle.properties index 8b30ea3e..c6cdc1e1 100755 --- a/weather-icons-typeface-library/gradle.properties +++ b/weather-icons-typeface-library/gradle.properties @@ -17,3 +17,5 @@ POM_NAME=Android-Iconics Weather Icons Typeface Library POM_ARTIFACT_ID=weather-icons-typeface POM_PACKAGING=aar +VERSION_CODE=20109 +VERSION_NAME=2.0.10.9-kotlin \ No newline at end of file