Skip to content

Commit

Permalink
Release io.github.rockerhieu:emojicon:1.3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
rockerhieu committed Aug 1, 2016
1 parent 3e8f522 commit e0b82cf
Show file tree
Hide file tree
Showing 32 changed files with 173 additions and 268 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ android:
- platform-tools
- extra-android-support
- extra-android-m2repository
- android-22
- build-tools-22.0.1
- android-23
- build-tools-24.0.1
install:
- ./gradlew dependencies

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Android Gems](http://www.android-gems.com/badge/rockerhieu/emojicon.svg?branch=master)](http://www.android-gems.com/lib/rockerhieu/emojicon)

![master on Travis CI](https://travis-ci.org/rockerhieu/emojicon.png?branch=master) ![emojicon on Maven Central](https://maven-badges.herokuapp.com/maven-central/com.rockerhieu.emojicon/library/badge.svg)
![master on Travis CI](https://travis-ci.org/rockerhieu/emojicon.png?branch=master) ![emojicon on Maven Central](https://maven-badges.herokuapp.com/maven-central/io.github.rockerhieu/emojicon/badge.svg)

## Emojicon

Expand All @@ -17,14 +17,14 @@ Fore more information please see [the website](http://rockerhieu.github.io/emoji
android:layout_height="match_parent"
android:orientation="vertical">

<com.rockerhieu.emojicon.EmojiconTextView
<io.github.rockerhieu.emojicon.EmojiconTextView
android:id="@+id/txtEmojicon"
android:text="I \ue32d emojicon"
emojicon:emojiconAlignment="baseline"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>

<com.rockerhieu.emojicon.EmojiconEditText
<io.github.rockerhieu.emojicon.EmojiconEditText
android:id="@+id/editEmojicon"
android:text="I \ue32d emojicon"
emojicon:emojiconSize="28sp"
Expand All @@ -34,7 +34,7 @@ Fore more information please see [the website](http://rockerhieu.github.io/emoji
android:id="@+id/emojicons"
android:layout_width="match_parent"
android:layout_height="220dp"
class="com.rockerhieu.emojicon.EmojiconsFragment"/>
class="io.github.rockerhieu.emojicon.EmojiconsFragment"/>
</LinearLayout>
```

Expand All @@ -55,7 +55,7 @@ _Note: You can change the size and alignment of emojis in XML layout through att
Via Gradle:

```
compile 'com.rockerhieu.emojicon:library:<latest-version>'
compile 'io.github.rockerhieu:emojicon:<latest-version>'
```

## Building in Eclipse
Expand Down
6 changes: 4 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@

buildscript {
repositories {
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.3.1'
classpath 'com.android.tools.build:gradle:2.2.0-alpha6'
}
}

Expand All @@ -14,4 +15,5 @@ allprojects {
mavenCentral()
maven { url 'https://raw.github.com/rockerhieu/mvn-repo/master/' }
}
}
}

19 changes: 0 additions & 19 deletions emojicon.iml

This file was deleted.

8 changes: 4 additions & 4 deletions example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
compileSdkVersion 23
buildToolsVersion "24.0.1"

defaultConfig {
minSdkVersion 16
targetSdkVersion 22
targetSdkVersion 23
versionCode 1
versionName "1.0"
}
Expand Down Expand Up @@ -57,6 +57,6 @@ if (project.hasProperty('keystorepassword')) {
}

dependencies {
compile 'com.android.support:appcompat-v7:22.2.1'
compile 'com.android.support:appcompat-v7:24.1.1'
compile project(':library')
}
91 changes: 0 additions & 91 deletions example/example.iml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
import android.widget.CheckBox;
import android.widget.CompoundButton;

import com.rockerhieu.emojicon.EmojiconEditText;
import com.rockerhieu.emojicon.EmojiconGridFragment;
import com.rockerhieu.emojicon.EmojiconTextView;
import com.rockerhieu.emojicon.EmojiconsFragment;
import com.rockerhieu.emojicon.emoji.Emojicon;
import io.github.rockerhieu.emojicon.EmojiconEditText;
import io.github.rockerhieu.emojicon.EmojiconGridFragment;
import io.github.rockerhieu.emojicon.EmojiconTextView;
import io.github.rockerhieu.emojicon.EmojiconsFragment;
import io.github.rockerhieu.emojicon.emoji.Emojicon;

public class MainActivity extends FragmentActivity implements EmojiconGridFragment.OnEmojiconClickedListener, EmojiconsFragment.OnEmojiconBackspaceClickedListener {
EmojiconEditText mEditEmojicon;
Expand Down
4 changes: 2 additions & 2 deletions example/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
android:id="@+id/use_system_default"
android:checked="false" />

<com.rockerhieu.emojicon.EmojiconTextView
<io.github.rockerhieu.emojicon.EmojiconTextView
android:id="@+id/txtEmojicon"
android:text="@string/i_love_emojicon"
emojicon:emojiconAlignment="baseline"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

<com.rockerhieu.emojicon.EmojiconEditText
<io.github.rockerhieu.emojicon.EmojiconEditText
android:id="@+id/editEmojicon"
android:hint="@string/hint"
android:text="@string/i_love_emojicon"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=http\://services.gradle.org/distributions/gradle-2.4-all.zip
distributionUrl=http\://services.gradle.org/distributions/gradle-2.10-all.zip
79 changes: 79 additions & 0 deletions library/bintray.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
ext {
bintray = [
bintrayRepo : "maven",
bintrayName : "emojicon",

publishedGroupId : GROUP,
libraryName : POM_NAME,
artifact : POM_ARTIFACT_ID,

libraryDescription: POM_DESCRIPTION,

siteUrl : POM_SCM_URL,
gitUrl : POM_SCM_CONNECTION,

libraryVersion : VERSION_NAME,

developerId : POM_DEVELOPER_ID,
developerName : POM_DEVELOPER_NAME,
developerEmail : POM_DEVELOPER_EMAIL,

licenseName : POM_LICENCE_NAME,
licenseUrl : POM_LICENCE_URL,
allLicenses : ["Apache-2.0"]
]
}

version = project.ext.bintray.libraryVersion

task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
classifier = "sources"
}

task javadoc(type: Javadoc) {
source = android.sourceSets.main.java.srcDirs
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
options.addStringOption('Xdoclint:none', '-quiet')
options.addStringOption('encoding', 'UTF-8')
}

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

artifacts {
archives javadocJar
archives sourcesJar
}

// Bintray
Properties properties = new Properties()
properties.load(project.rootProject.file("local.properties").newDataInputStream())

bintray {
user = properties.getProperty("bintray.user")
key = properties.getProperty("bintray.apikey")

configurations = ["archives"]
pkg {
repo = project.ext.bintray.bintrayRepo
name = project.ext.bintray.bintrayName
desc = project.ext.bintray.libraryDescription
websiteUrl = project.ext.bintray.siteUrl
vcsUrl = project.ext.bintray.gitUrl
licenses = project.ext.bintray.allLicenses
publish = true
publicDownloadNumbers = true
userOrg = properties.getProperty("bintray.userOrg")
version {
desc = project.ext.bintray.libraryDescription
gpg {
sign = true //Determines whether to GPG sign the files. The default is false
passphrase = properties.getProperty("bintray.gpg.password")
//Optional. The passphrase for GPG signing
}
}
}
}
17 changes: 11 additions & 6 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
plugins {
id "com.jfrog.bintray" version "1.7.1"
}
apply plugin: 'com.android.library'
apply from: 'gradle-mvn-push.gradle'

android {
compileSdkVersion 22
buildToolsVersion "22.0.1"
compileSdkVersion 23
buildToolsVersion "24.0.1"

defaultConfig {
minSdkVersion 7
targetSdkVersion 22
targetSdkVersion 23
}
lintOptions {
abortOnError false
}
}

dependencies {
compile 'com.android.support:support-v4:22.2.1'
compile 'com.android.support:appcompat-v7:22.2.1'
compile 'com.android.support:support-v4:24.1.1'
compile 'com.android.support:appcompat-v7:24.1.1'
}

apply from: 'gradle-mvn-push.gradle'
apply from: 'bintray.gradle'
9 changes: 5 additions & 4 deletions library/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
# limitations under the License.
#

VERSION_NAME=1.3.4-SNAPSHOT
GROUP=com.rockerhieu.emojicon
VERSION_NAME=1.3.4
GROUP=io.github.rockerhieu

POM_DESCRIPTION=A library to show emoji in TextView, EditText (like WhatsApp) for Android
POM_URL=http://rockerhieu.com/emojicon
POM_URL=http://rockerhieu.github.io/emojicon
POM_SCM_URL=https://github.com/rockerhieu/emojicon
POM_SCM_CONNECTION=scm:[email protected]:rockerhieu/emojicon.git
POM_SCM_DEV_CONNECTION=scm:[email protected]:rockerhieu/emojicon.git
Expand All @@ -27,9 +27,10 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=rockerhieu
POM_DEVELOPER_NAME=Hieu Rocker
POM_DEVELOPER_EMAIL=[email protected]

POM_NAME=Emojicon Library for Android
POM_ARTIFACT_ID=library
POM_ARTIFACT_ID=emojicon
POM_PACKAGING=aar


Expand Down
Loading

0 comments on commit e0b82cf

Please sign in to comment.