Skip to content

Commit 9cbe9e7

Browse files
attenzioneattenzione
authored
Merge pull request #42 from stephanepechard/master
Upload to bintray for gradle installation
2 parents e3aa301 + dacb80c commit 9cbe9e7

File tree

6 files changed

+96
-32
lines changed

6 files changed

+96
-32
lines changed

‎ColorPickerPreference/ColorPickerPreference.iml‎

Lines changed: 47 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../MonthCalendarWidget" external.system.id="GRADLE" external.system.module.group="MonthCalendarWidget....android-ColorPickerPreference" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id=":ColorPickerPreference" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="MonthCalendarWidget....android-ColorPickerPreference" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
6-
<option name="GRADLE_PROJECT_PATH" value=":..:android-ColorPickerPreference:ColorPickerPreference" />
6+
<option name="GRADLE_PROJECT_PATH" value=":ColorPickerPreference" />
77
</configuration>
88
</facet>
99
<facet type="android" name="Android">
@@ -12,9 +12,9 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
16-
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
17-
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
15+
<afterSyncTasks>
16+
<task>generateDebugSources</task>
17+
</afterSyncTasks>
1818
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1919
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2020
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -24,7 +24,7 @@
2424
</configuration>
2525
</facet>
2626
</component>
27-
<component name="NewModuleRootManager" inherit-compiler-output="false">
27+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
2828
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
2929
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3030
<exclude-output />
@@ -33,59 +33,81 @@
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3434
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3637
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
38-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
40-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
41-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
42-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
43-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
44+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4446
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4547
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4648
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4749
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4850
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4951
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5052
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
5162
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5263
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5364
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5465
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5566
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5667
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5768
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
5878
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
5979
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
6080
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
6181
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
6282
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6383
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6484
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
65-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
6688
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6789
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
6990
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
71-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7291
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
7694
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
7795
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
79-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
8196
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8297
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
8399
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
84102
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
85104
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
86105
</content>
87106
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
88107
<orderEntry type="sourceFolder" forTests="false" />
89108
</component>
90-
</module>
91-
109+
<component name="sonarModuleSettings">
110+
<option name="localAnalysisScripName" value="&lt;PROJECT&gt;" />
111+
<option name="serverName" value="&lt;PROJECT&gt;" />
112+
</component>
113+
</module>

‎ColorPickerPreference/build.gradle‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
11
apply plugin: 'com.android.library'
22

3+
ext {
4+
bintrayRepo = 'android-ColorPickerPreference'
5+
bintrayName = 'android-colorpickerpreference'
6+
7+
publishedGroupId = 'net.margaritov.preference.colorpicker.ColorPickerPreference'
8+
libraryName = 'ColorPickerPreference'
9+
artifact = 'ColorPickerPreference'
10+
11+
libraryDescription = 'ColorPickerPreference for android to create color picker in preferences. Project created as Library'
12+
13+
siteUrl = 'https://github.com/attenzione/android-ColorPickerPreference'
14+
gitUrl = 'https://github.com/attenzione/android-ColorPickerPreference.git'
15+
16+
libraryVersion = '1.0.0'
17+
18+
developerId = 'attenzione'
19+
developerName = 'Sergey Margaritov'
20+
developerEmail = '[email protected]'
21+
22+
licenseName = 'The Apache Software License, Version 2.0'
23+
licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
24+
allLicenses = ["Apache-2.0"]
25+
}
26+
327
android {
428
compileSdkVersion 21
529
buildToolsVersion "21.1.2"
@@ -21,3 +45,7 @@ android {
2145
dependencies {
2246
compile fileTree(dir: 'libs', include: ['*.jar'])
2347
}
48+
49+
// Place it at the end of the file
50+
apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
51+
apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'

‎README.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,14 @@ Tested with APIv7, but maybe will work with early versions
2424
Installation
2525
===========
2626

27+
Through Gradle
28+
--------------
29+
30+
You can now install this through Gradle with a simple:
31+
::
32+
33+
compile 'net.margaritov.preference.colorpicker.ColorPickerPreference:ColorPickerPreference:1.0.0'
34+
2735
Android Studio
2836
--------------
2937

‎android-ColorPickerPreference.iml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../MonthCalendarWidget" external.system.id="GRADLE" external.system.module.group="MonthCalendarWidget..." external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.id="android-ColorPickerPreference" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="MonthCalendarWidget..." external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="java-gradle" name="Java-Gradle">
55
<configuration>
66
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
7+
<option name="BUILDABLE" value="false" />
78
</configuration>
89
</facet>
910
</component>
10-
<component name="NewModuleRootManager" inherit-compiler-output="true">
11+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
1112
<exclude-output />
1213
<content url="file://$MODULE_DIR$">
1314
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
1415
</content>
1516
<orderEntry type="inheritedJdk" />
1617
<orderEntry type="sourceFolder" forTests="false" />
1718
</component>
18-
</module>
19-
19+
<component name="sonarModuleSettings">
20+
<option name="localAnalysisScripName" value="&lt;PROJECT&gt;" />
21+
<option name="serverName" value="&lt;PROJECT&gt;" />
22+
</component>
23+
</module>

‎build.gradle‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.0.0'
8+
classpath 'com.android.tools.build:gradle:2.2.2'
9+
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.4'
10+
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
911

1012
// NOTE: Do not place your application dependencies here; they belong
1113
// in the individual module build.gradle files

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Tue Nov 15 22:19:55 CET 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

0 commit comments

Comments
 (0)