Skip to content

Commit

Permalink
Rename lib module to material.
Browse files Browse the repository at this point in the history
Add jcenter support.
  • Loading branch information
rey5137 committed Dec 3, 2015
1 parent c0205a0 commit 716a510
Show file tree
Hide file tree
Showing 81 changed files with 648 additions and 569 deletions.
2 changes: 1 addition & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Material.iml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="Material" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.github.rey5137" external.system.module.version="1.2.1.13-SNAPSHOT" type="JAVA_MODULE" version="4">
<module external.linked.project.id="Material" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
Expand Down
8 changes: 2 additions & 6 deletions app/app.iml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.rey5137" external.system.module.version="1.2.1.13-SNAPSHOT" type="JAVA_MODULE" version="4">
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Material" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
Expand Down Expand Up @@ -68,7 +68,6 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
Expand All @@ -78,12 +77,9 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/ivy.xml" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
Expand All @@ -98,6 +94,6 @@
<orderEntry type="library" exported="" name="cardview-v7-23.1.1" level="project" />
<orderEntry type="library" exported="" name="leakcanary-android-1.3.1" level="project" />
<orderEntry type="library" exported="" name="haha-1.3" level="project" />
<orderEntry type="module" module-name="lib" exported="" />
<orderEntry type="module" module-name="material" exported="" />
</component>
</module>
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ dependencies {
compile "com.android.support:cardview-v7:${libSupportVersion}"
compile 'com.squareup.picasso:picasso:2.5.0'
compile 'com.squareup.leakcanary:leakcanary-android:1.3.1'
compile project(':lib')
compile project(':material')
}
2 changes: 0 additions & 2 deletions app/src/main/java/com/rey/material/app/ContactEditText.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import android.text.TextUtils;
import android.text.TextWatcher;
import android.util.AttributeSet;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
Expand All @@ -48,7 +47,6 @@
import com.squareup.picasso.Target;

import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap;

/**
Expand Down
6 changes: 2 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,14 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:1.5.0'

classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}

allprojects {
version = VERSION_NAME
group = GROUP

repositories {
jcenter()
}
Expand Down
118 changes: 118 additions & 0 deletions dist/bintray.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
apply plugin: 'com.github.dcendents.android-maven'
apply plugin: 'com.jfrog.bintray'

ext {
bintrayUser = BINTRAY_USERNAME
bintrayApiKey = BINTRAY_APIKEY
bintrayGpgPassword = GPG_PASSWORD

bintrayRepo = 'maven'
bintrayName = 'material'

publishedGroupId = 'com.github.rey5137'
libraryName = 'Material Library'
artifact = 'material'

libraryDescription = 'An Android library to bring Material Design UI to pre-Lolipop Android.'

siteUrl = 'https://github.com/rey5137/material'
gitUrl = 'https://github.com/rey5137/material.git'

libraryVersion = '1.2.2'

developerId = 'rey5137'
developerName = 'Rey Pham'
developerEmail = '[email protected]'

licenseName = 'The Apache Software License, Version 2.0'
licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
allLicenses = ["Apache-2.0"]
}

group = publishedGroupId // Maven Group ID for the artifact

install {
repositories.mavenInstaller {
// This generates POM.xml with proper parameters
pom {
project {
packaging 'aar'
groupId publishedGroupId
artifactId artifact

// Add your description here
name libraryName
description libraryDescription
url siteUrl

// Set your license
licenses {
license {
name licenseName
url licenseUrl
}
}
developers {
developer {
id developerId
name developerName
email developerEmail
}
}
scm {
connection gitUrl
developerConnection gitUrl
url siteUrl

}
}
}
}
}

version = 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))
}

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

artifacts {
archives javadocJar
archives sourcesJar
}

bintray {
user = bintrayUser
key = bintrayApiKey

configurations = ['archives']
pkg {
repo = bintrayRepo
name = bintrayName
desc = libraryDescription
websiteUrl = siteUrl
vcsUrl = gitUrl
licenses = allLicenses
publish = true
publicDownloadNumbers = true
version {
desc = libraryDescription
gpg {
sign = true //Determines whether to GPG sign the files. The default is false
passphrase = bintrayGpgPassword
//Optional. The passphrase for GPG signing'
}
}
}
}
14 changes: 0 additions & 14 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,3 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true

VERSION_NAME=1.2.1.13-SNAPSHOT
VERSION_CODE=20
GROUP=com.github.rey5137

POM_DESCRIPTION= An Android library to bring Material Design UI to pre-Lolipop Android.
POM_URL=https://github.com/rey5137/Material
POM_SCM_URL=https://github.com/rey5137/Material
POM_SCM_CONNECTION=scm:[email protected]:rey5137/Material.git
POM_SCM_DEV_CONNECTION=scm:[email protected]:rey5137/Material.git
POM_LICENCE_NAME=The Apache Software License, Version 2.0
POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo
POM_DEVELOPER_ID=rey5137
POM_DEVELOPER_NAME=Rey Pham
3 changes: 0 additions & 3 deletions lib/gradle.properties

This file was deleted.

7 changes: 0 additions & 7 deletions lib/src/main/AndroidManifest.xml

This file was deleted.

5 changes: 0 additions & 5 deletions lib/src/main/res/values/strings.xml

This file was deleted.

File renamed without changes.
9 changes: 5 additions & 4 deletions lib/build.gradle → material/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ apply plugin: 'com.android.library'

android {
compileSdkVersion 23
buildToolsVersion '23.0.2'
buildToolsVersion "23.0.2"

defaultConfig {
minSdkVersion 9
targetSdkVersion 23
versionCode 20
versionName "1.2.1.13"
versionCode 21
versionName "1.2.2"
}
buildTypes {
release {
Expand All @@ -24,9 +24,10 @@ ext{

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile "com.android.support:appcompat-v7:${libSupportVersion}"
compile "com.android.support:cardview-v7:${libSupportVersion}"
compile "com.android.support:recyclerview-v7:${libSupportVersion}"
}

apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
apply from: '../dist/bintray.gradle'
8 changes: 2 additions & 6 deletions lib/lib.iml → material/material.iml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":lib" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.rey5137" external.system.module.version="1.2.1.13-SNAPSHOT" type="JAVA_MODULE" version="4">
<module external.linked.project.id=":material" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.rey5137" external.system.module.version="1.2.2" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":lib" />
<option name="GRADLE_PROJECT_PATH" value=":material" />
</configuration>
</facet>
<facet type="android" name="Android">
Expand Down Expand Up @@ -75,14 +75,10 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/ivy.xml" />
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
Expand Down
2 changes: 1 addition & 1 deletion lib/proguard-rules.pro → material/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in D:/vietph/android/adt-bundle-windows-x86_64-20140702/sdk/tools/proguard/proguard-android.txt
# in D:\vietph\android\adt-bundle-windows-x86_64-20140702\sdk/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
#
Expand Down
4 changes: 4 additions & 0 deletions material/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<manifest package="com.rey.material"
xmlns:android="http://schemas.android.com/apk/res/android">

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ public BottomSheetDialog contentView(int layoutId){

/**
* Set the height params of this BottomSheetDialog's content view.
* @param height The height param. Can be the size in pixels, or {@link android.view.ViewGroup.LayoutParams#WRAP_CONTENT} or {@link android.view.ViewGroup.LayoutParams#MATCH_PARENT}.
* @param height The height param. Can be the size in pixels, or {@link ViewGroup.LayoutParams#WRAP_CONTENT} or {@link ViewGroup.LayoutParams#MATCH_PARENT}.
* @return The BottomSheetDialog for chaining methods.
*/
public BottomSheetDialog heightParam(int height){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
import android.graphics.Path;
import android.graphics.Rect;
import android.graphics.RectF;
import android.graphics.drawable.ColorDrawable;
import android.os.Parcel;
import android.os.Parcelable;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
Expand Down Expand Up @@ -142,7 +140,7 @@ public DatePickerDialog date(long time){

/**
* Set the listener will be called when the selected date is changed.
* @param listener The {@link DatePickerDialog.OnDateChangedListener} will be called.
* @param listener The {@link OnDateChangedListener} will be called.
* @return The DatePickerDialog for chaining methods.
*/
public DatePickerDialog onDateChangedListener(OnDateChangedListener listener){
Expand Down Expand Up @@ -855,7 +853,7 @@ protected void onWriteToParcel(Parcel dest, int flags) {
dest.writeInt(mYear);
}

public static final Parcelable.Creator<Builder> CREATOR = new Parcelable.Creator<Builder>() {
public static final Creator<Builder> CREATOR = new Creator<Builder>() {
public Builder createFromParcel(Parcel in) {
return new Builder(in);
}
Expand Down
Loading

0 comments on commit 716a510

Please sign in to comment.