Skip to content

Commit

Permalink
Moved to new Gradle project structure
Browse files Browse the repository at this point in the history
  • Loading branch information
LarsWerkman committed Mar 2, 2015
1 parent 7e08aa9 commit 3971e5d
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 52 deletions.
11 changes: 0 additions & 11 deletions AndroidManifest.xml

This file was deleted.

24 changes: 4 additions & 20 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
repositories {
jcenter()
Expand All @@ -6,30 +8,12 @@ buildscript {
classpath 'com.android.tools.build:gradle:1.1.0'
}
}

allprojects {
version = VERSION_NAME
group = GROUP

repositories {
mavenCentral()
}
}
apply plugin: 'com.android.library'

android {
compileSdkVersion 21
buildToolsVersion '21.1.2'
sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
res.srcDirs = ['res']
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_6
targetCompatibility JavaVersion.VERSION_1_6
jcenter()
}
}

apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
13 changes: 13 additions & 0 deletions libary/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 21
buildToolsVersion "21.1.2"

defaultConfig {
minSdkVersion 8
targetSdkVersion 21
}
}

apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle'
4 changes: 4 additions & 0 deletions libary/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.larswerkman.holocolorpicker">

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ public int getColor() {
* WARNING: Don't change the color picker. it is done already when the bar
* is added to the ColorPicker
*
* @see ColorPicker#addSVBar(SVBar)
* @see com.larswerkman.holocolorpicker.ColorPicker#addSVBar(SVBar)
* @param picker
*/
public void setColorPicker(ColorPicker picker) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ public int getColor() {
* WARNING: Don't change the color picker. it is done already when the bar
* is added to the ColorPicker
*
* @see ColorPicker#addSVBar(com.larswerkman.holocolorpicker.SVBar)
* @see com.larswerkman.holocolorpicker.ColorPicker#addSVBar(SVBar)
* @param picker
*/
public void setColorPicker(ColorPicker picker) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ public int getColor() {
* WARNING: Don't change the color picker. it is done already when the bar
* is added to the ColorPicker
*
* @see ColorPicker#addSVBar(SVBar)
* @see com.larswerkman.holocolorpicker.ColorPicker#addSVBar(SVBar)
* @param picker
*/
public void setColorPicker(ColorPicker picker) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ public int getColor() {
* WARNING: Don't change the color picker. it is done already when the bar
* is added to the ColorPicker
*
* @see ColorPicker#addSVBar(SVBar)
* @see com.larswerkman.holocolorpicker.ColorPicker#addSVBar(com.larswerkman.holocolorpicker.SVBar)
* @param picker
*/
public void setColorPicker(ColorPicker picker) {
Expand Down
File renamed without changes.
File renamed without changes.
15 changes: 0 additions & 15 deletions project.properties

This file was deleted.

3 changes: 1 addition & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
rootProject.name = 'holocolorpicker'

include ':libary'

0 comments on commit 3971e5d

Please sign in to comment.