From 8384e4c36526926f738ec921ee7c126d4007db89 Mon Sep 17 00:00:00 2001 From: Krzysztof Karczewski Date: Fri, 18 Jul 2025 15:02:42 +0200 Subject: [PATCH 1/3] chore: fix library publishing --- build.gradle | 4 +-- library/build.gradle | 67 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 21c6ef3d..43118989 100644 --- a/build.gradle +++ b/build.gradle @@ -10,10 +10,10 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:8.5.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' // TODO: Close JCenter on May 1st https://jfrog.com/blog/into-the-sunset-bintray-jcenter-gocenter-and-chartcenter/ // classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5' -// classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' } } @@ -27,4 +27,4 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir -} \ No newline at end of file +} diff --git a/library/build.gradle b/library/build.gradle index 199d061e..3fa88259 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -28,6 +28,12 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + publishing { + singleVariant("release") { + withSourcesJar() + withJavadocJar() + } + } } ext { @@ -54,4 +60,63 @@ ext { // apply from: 'https://gist.githubusercontent.com/wasabeef/cf14805bee509baf7461974582f17d26/raw/bintray-v1.gradle' // apply from: 'https://gist.githubusercontent.com/wasabeef/cf14805bee509baf7461974582f17d26/raw/install-v1.gradle' -//apply from: 'https://gist.githubusercontent.com/wasabeef/2f2ae8d97b429e7d967128125dc47854/raw/maven-central-v1.gradle' \ No newline at end of file +// apply from: 'https://gist.githubusercontent.com/wasabeef/2f2ae8d97b429e7d967128125dc47854/raw/maven-central-v1.gradle' + +apply plugin: 'maven-publish' +apply plugin: 'signing' + +def sonatypeUsername = rootProject.hasProperty('sonatypeUsername')? rootProject.sonatypeUsername : '' +def sonatypePassword = rootProject.hasProperty('sonatypePassword')? rootProject.sonatypePassword : '' + +afterEvaluate { + group = publishedGroupId + version = libraryVersion + + publishing { + publications { + release(MavenPublication) { + artifactId = artifact + from components.release + + pom { + name = artifact + description = libraryDescription + url = siteUrl + licenses { + license { + name = licenseName + url = licenseUrl + } + } + developers { + developer { + id = developerId + name = developerName + email = developerEmail + } + } + scm { + connection = gitUrl + developerConnection = gitUrl + url = siteUrl + } + } + } + } + repositories { + maven { + def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2" + def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots" + url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl + credentials { + username = "${sonatypeUsername}" + password = "${sonatypePassword}" + } + } + } + } +} + +/*signing { + sign publishing.publications +}*/ From c068d4790c472c05934a104a032c183f61c2e4af Mon Sep 17 00:00:00 2001 From: Krzysztof Karczewski Date: Tue, 22 Jul 2025 12:14:27 +0200 Subject: [PATCH 2/3] chore: add jitpack badge --- README.md | 1 + gradle.properties | 2 +- jitpack.yml | 4 ++++ library/build.gradle | 11 +++++++---- 4 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 jitpack.yml diff --git a/README.md b/README.md index dffd063a..7aa61831 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ [![License](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0) [![Download](https://api.bintray.com/packages/cats-oss/maven/gpuimage/images/download.svg) ](https://bintray.com/cats-oss/maven/gpuimage/_latestVersion) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/jp.co.cyberagent.android/gpuimage/badge.svg)](https://search.maven.org/artifact/jp.co.cyberagent.android/gpuimage) +[![](https://jitpack.io/v/karczews/android-gpuimage.svg)](https://jitpack.io/#karczews/android-gpuimage) [![Build Status](https://app.bitrise.io/app/d8d8090a71066e7c/status.svg?token=sJNbvX8CkecWcUA5Z898lQ&branch=master)](https://app.bitrise.io/app/d8d8090a71066e7c) Idea from: [iOS GPUImage framework](https://github.com/BradLarson/GPUImage2) diff --git a/gradle.properties b/gradle.properties index 6f738106..77d8458e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=1024m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects diff --git a/jitpack.yml b/jitpack.yml new file mode 100644 index 00000000..b35928b3 --- /dev/null +++ b/jitpack.yml @@ -0,0 +1,4 @@ +jdk: + - openjdk17 +install: + - ./gradlew :library:publishReleasePublicationToMavenLocal diff --git a/library/build.gradle b/library/build.gradle index 3fa88259..69e8e700 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,4 +1,9 @@ -apply plugin: 'com.android.library' +plugins { + id 'com.android.library' + id 'kotlin-android' + id 'maven-publish' + id 'signing' +} android { compileSdk COMPILE_SDK_VERSION as int @@ -62,9 +67,6 @@ ext { // apply from: 'https://gist.githubusercontent.com/wasabeef/2f2ae8d97b429e7d967128125dc47854/raw/maven-central-v1.gradle' -apply plugin: 'maven-publish' -apply plugin: 'signing' - def sonatypeUsername = rootProject.hasProperty('sonatypeUsername')? rootProject.sonatypeUsername : '' def sonatypePassword = rootProject.hasProperty('sonatypePassword')? rootProject.sonatypePassword : '' @@ -104,6 +106,7 @@ afterEvaluate { } } repositories { + mavenLocal() maven { def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2" def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots" From 293b8cf3ac10eac0f78311628ed4fcad1e0a1536 Mon Sep 17 00:00:00 2001 From: Krzysztof Karczewski Date: Fri, 22 Aug 2025 19:40:57 +0200 Subject: [PATCH 3/3] chore: add missing abis --- gradle.properties | 2 +- library/build.gradle | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 77d8458e..562cc177 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ org.gradle.configureondemand=true org.gradle.caching=true #android.enableBuildCache=true -VERSION_NAME=2.2.0 +VERSION_NAME=2.2.2 VERSION_CODE=16 COMPILE_SDK_VERSION=34 diff --git a/library/build.gradle b/library/build.gradle index 69e8e700..8f6858d9 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -14,8 +14,7 @@ android { versionCode = VERSION_CODE as int versionName = VERSION_NAME -// ndk.abiFilters 'armeabi-v7a','arm64-v8a','x86','x86_64' - ndk.abiFilters 'armeabi-v7a','arm64-v8a' + ndk.abiFilters 'armeabi-v7a','arm64-v8a','x86','x86_64' externalNativeBuild { cmake { cppFlags "" } }