From 981882936d4ca8cab6df8f69719e4326ab3a2c72 Mon Sep 17 00:00:00 2001 From: wasabeef Date: Fri, 12 Feb 2021 18:19:56 +0900 Subject: [PATCH 1/2] chore(maven): add settings for maven central --- README.md | 2 +- build.gradle | 9 ++++++--- gradle/wrapper/gradle-wrapper.properties | 4 ++-- library/build.gradle | 7 +++++-- sample/build.gradle | 4 +--- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index c777d174b..3373b6457 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Goal is to have something as similar to GPUImage as possible. Vertex and fragmen ```groovy repositories { - jcenter() + mavenCentral() } dependencies { diff --git a/build.gradle b/build.gradle index 3994b33a0..72026fdd6 100644 --- a/build.gradle +++ b/build.gradle @@ -7,16 +7,19 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0-rc02' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5' - classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' + classpath 'com.android.tools.build:gradle:4.2.0-beta04' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + +// 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' } } allprojects { repositories { google() + mavenCentral() jcenter() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 12d38de6a..a7a55a149 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip +distributionUrl=https://services.gradle.org/distributions/gradle-6.7.1-bin.zip zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists +zipStorePath=wrapper/dists \ No newline at end of file diff --git a/library/build.gradle b/library/build.gradle index 31c45e9b5..c13645463 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -49,5 +49,8 @@ ext { allLicenses = ["Apache-2.0"] } -apply from: 'https://gist.githubusercontent.com/wasabeef/cf14805bee509baf7461974582f17d26/raw/bintray-v1.gradle' -apply from: 'https://gist.githubusercontent.com/wasabeef/cf14805bee509baf7461974582f17d26/raw/install-v1.gradle' \ No newline at end of file +// TODO: Close JCenter on May 1st https://jfrog.com/blog/into-the-sunset-bintray-jcenter-gocenter-and-chartcenter/ +// 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 diff --git a/sample/build.gradle b/sample/build.gradle index 289142da7..ed3d3249c 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -27,9 +27,7 @@ android { } } repositories { - google() - jcenter() -// maven { url "https://dl.bintray.com/cats-oss/maven" } +// maven { url = "https://oss.sonatype.org/content/repositories/snapshots"} } dependencies { From 3daf7100b1360609faae7953518bd585f61bddc8 Mon Sep 17 00:00:00 2001 From: wasabeef Date: Fri, 12 Feb 2021 18:26:50 +0900 Subject: [PATCH 2/2] chore(maven): update readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3373b6457..dffd063aa 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # GPUImage for Android [![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) [![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)