Skip to content

Commit

Permalink
Merge pull request #247 from sangcomz/release/1.1.0-alpha06
Browse files Browse the repository at this point in the history
Release/1.1.0 alpha06
  • Loading branch information
sangcomz authored Jan 7, 2022
2 parents 9015703 + e4a917e commit f2f89d6
Show file tree
Hide file tree
Showing 8 changed files with 139 additions and 154 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
jobs:
build:

runs-on: ubuntu-latest
runs-on: macos-latest

steps:
- uses: actions/checkout@v2
Expand All @@ -24,10 +24,10 @@ jobs:
- name: Android Emulator Runner
# You may pin to the exact commit or the version.
# uses: ReactiveCircus/android-emulator-runner@e08f702234bdc95883c7fd5c7d2867ccf1a8463b
uses: ReactiveCircus/android-emulator-runner@v2.13.0
uses: reactivecircus/android-emulator-runner@v2
with:
# API level of the platform and system image - e.g. 23 for Android Marshmallow, 29 for Android 10
api-level: 25
api-level: 29
script: ./gradlew connectedCheck connectedAndroidTest
- name: Codecov
uses: codecov/[email protected]
5 changes: 1 addition & 4 deletions FishBun/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'com.hiya.jacoco-android'
apply plugin: 'de.mobilej.unmock'
apply plugin: 'maven-publish'

buildscript {
repositories {
Expand All @@ -15,7 +14,6 @@ buildscript {

dependencies {
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3"
classpath 'com.hiya:jacoco-android:0.2'
classpath 'co.riiid:gradle-github-plugin:0.4.2'
}
Expand Down Expand Up @@ -56,10 +54,9 @@ android {
}

apply plugin: 'com.github.dcendents.android-maven'
apply plugin: "com.jfrog.bintray"
apply plugin: 'co.riiid.gradle'

apply from: '../gradle/release.gradle'
apply from: '../publish/release.gradle'

unMock {
keep "android.net.Uri"
Expand Down
32 changes: 4 additions & 28 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-FishBun-green.svg?style=true)](https://android-arsenal.com/details/1/2785)
[![Build Status](https://travis-ci.org/sangcomz/FishBun.svg?branch=master)](https://travis-ci.org/sangcomz/FishBun)
[![codecov](https://codecov.io/gh/sangcomz/FishBun/branch/master/graph/badge.svg)](https://codecov.io/gh/sangcomz/FishBun)
[![Download](https://api.bintray.com/packages/sangcomz/maven/fishbun/images/download.svg)](https://bintray.com/sangcomz/maven/fishbun/_latestVersion)
[![Maven Central](https://img.shields.io/maven-central/v/io.github.sangcomz/fishbun)](https://search.maven.org/artifact/io.github.sangcomz/fishbun)
<p style="float:left;">
<a href="https://play.google.com/store/apps/details?id=com.sangcomz.fishbundemo">
<img HEIGHT="40" WIDTH="135" alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/apps/en-play-badge.png" />
Expand All @@ -15,17 +15,9 @@ _FishBun_ is a highly customizable image picker for Android.
<img src="/pic/fishbuns.png">


## What's New in _FishBun_ 1.0.0-alpha05? :tada:
## What's New in _FishBun_ 1.0.0-alpha06? :tada:

- Refactoring for rapid development:rocket::rocket::rocket:
- Change PickerSpanCount default value (`3`->`4`)
- target SDK 30 support
- In API 29 or higher, the camera can be used only in the total image folder.
- Fix Issue(#215)
- Change DetailView statusBar color
- Removed Picasso and added Coil
- Support Chinese
- Fix Issue(#223)
- upload artifact to maven central


## Customizable Styles
Expand Down Expand Up @@ -117,24 +109,8 @@ Fishbun 0.10.0 and above only supports projects that have been migrated to [andr

Setting up _FishBun_ requires to add this Gradle configuration:

repositories {
jcenter()
}

dependencies {
// Under the Android Plugin 3.0.0.
compile 'com.sangcomz:FishBun:1.0.0-alpha05'
or
compile 'com.sangcomz:FishBun:0.11.4' //stable version
compile 'io.coil-kt:coil:0.11.0'
or
compile 'com.github.bumptech.glide:glide:4.9.0'
// Android plugin 3.0.0 or higher.
implementation 'com.sangcomz:FishBun:1.0.0-alpha05'
or
implementation 'com.sangcomz:FishBun:0.11.4' //stable version
implementation 'io.github.sangcomz:fishbun:1.0.0-alpha06'
implementation 'io.coil-kt:coil:0.11.0'
or
Expand Down
21 changes: 21 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,28 @@ allprojects {
repositories {
jcenter()
google()
}
}

if (project.rootProject.file('local.properties').isFile()) {
Properties props = new Properties()
props.load(new FileInputStream(rootProject.file("local.properties")))
project.ext {
setProperty("ossrhUsername", props["ossrhUsername"] ?: ' ')
setProperty("ossrhPassword", props["ossrhPassword"] ?: ' ')
setProperty("signingKeyId", props["signing.keyId"] ?: ' ')
setProperty("signingPassword", props["signing.password"] ?: ' ')
setProperty("signingKey", props["signing.key"] ?: ' ')
setProperty("githubAccessTokens", props["github_access_tokens"] ?: ' ')
}
} else {
project.ext {
setProperty("ossrhUsername", ' ')
setProperty("ossrhPassword", ' ')
setProperty("signingKeyId", ' ')
setProperty("signingPassword", ' ')
setProperty("signingKey", ' ')
setProperty("githubAccessTokens", ' ')
}
}

Expand Down
115 changes: 0 additions & 115 deletions gradle/release.gradle

This file was deleted.

106 changes: 106 additions & 0 deletions publish/release.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
apply plugin: "maven-publish"
apply plugin: "signing"

group = "io.github.sangcomz"
version = gradle.versionName
archivesBaseName = "fishbun"

def siteUrl = 'https://github.com/sangcomz/FishBun' // Homepage URL of the library
def gitUrl = 'https://github.com/sangcomz/FishBun.git' // Git repository URL

afterEvaluate {

task sourceJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
archiveClassifier.set("sources")
}

task javadoc(type: Javadoc) {
source = android.sourceSets.main.java.srcDirs
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
}

task javadocJar(type: Jar, dependsOn: javadoc) {
archiveClassifier.set("javadoc")
from javadoc.destinationDir
}

// https://docs.gradle.org/current/userguide/publishing_maven.html
publishing {
publications {
// Creates a Maven publication called "release".
release(MavenPublication) {
groupId group
artifactId archivesBaseName
version version

if (project.plugins.findPlugin("com.android.library")) {
from components.release
} else {
from components.java
}
artifact sourceJar
artifact javadocJar

pom {
name = archivesBaseName
description = 'FishBun is a highly customizable image picker for Android.'
url = siteUrl
licenses {
license {
name = 'The Apache License, Version 2.0'
url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
}
}
developers {
developer {
id = 'sangcomz'
name = 'Swokwon Jeong'
email = '[email protected]'
}
}
scm {
url = gitUrl
}
}
}
}

repositories {
maven {
if (version.endsWith("-SNAPSHOT")) {
url = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
} else {
url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
}
credentials {
username ossrhUsername
password ossrhPassword
}
}
}
}

signing {
useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
sign publishing.publications.release
}

javadoc {
if (JavaVersion.current().isJava9Compatible()) {
options.addBooleanOption('html5', true)
}
}
}

github {
owner = 'sangcomz'
repo = 'Fishbun'
token = githubAccessTokens
tagName = version
targetCommitish = 'master'
body = """## Release Note
* upload artifact to maven central
"""
name = version
}
2 changes: 1 addition & 1 deletion release.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
./gradlew clean bintrayUpload githubRelease
./gradlew clean fishbun:publishAllPublicationsToMavenRepository githubRelease
6 changes: 3 additions & 3 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
include ':FishBunDemo', ':FishBun'

gradle.ext.versionCode = 33
gradle.ext.versionName = '1.0.0-alpha05'
gradle.ext.versionCode = 34
gradle.ext.versionName = '1.0.0-alpha06'

gradle.ext.set('minSdk', 15)
gradle.ext.set('targetSdk', 30)
gradle.ext.set('compileSdk', 30)
gradle.ext.set('compileSdk', 30)

0 comments on commit f2f89d6

Please sign in to comment.