Skip to content

Commit af06950

Browse files
CliffusCliffus
committed
convert to library module + add bintray gradle config
1 parent a5256b4 commit af06950

20 files changed

Lines changed: 287 additions & 25 deletions

File tree

‎CHANGELOG.md‎

Whitespace-only changes.

‎app/app.iml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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="Android-ExpandableTextView" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<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="expandabletextview-root" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -88,6 +88,7 @@
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
8989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
9090
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
9192
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
9293
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
9394
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
@@ -104,5 +105,6 @@
104105
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
105106
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
106107
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
108+
<orderEntry type="module" module-name="expandabletextview" exported="" />
107109
</component>
108110
</module>

‎app/build.gradle‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ android {
2121

2222
dependencies {
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
24-
testCompile 'junit:junit:4.12'
2524
compile 'com.android.support:appcompat-v7:23.1.1'
25+
compile project(':expandabletextview')
26+
27+
28+
testCompile 'junit:junit:4.12'
2629
}

‎app/src/main/res/layout/activity_main.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
android:paddingTop="@dimen/activity_vertical_margin"
1313
tools:context="blogc.at.android.activities.MainActivity">
1414

15-
1615
<blogc.at.android.views.ExpandableTextView
1716
android:id="@+id/expandableTextView"
1817
android:layout_width="wrap_content"

‎build.gradle‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,16 @@ buildscript {
66
}
77
dependencies {
88
classpath 'com.android.tools.build:gradle:2.0.0-beta5'
9-
9+
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files
1212
}
1313
}
1414

15+
plugins {
16+
id "com.jfrog.bintray" version "1.6"
17+
}
18+
1519
allprojects {
1620
repositories {
1721
jcenter()
@@ -20,4 +24,4 @@ allprojects {
2024

2125
task clean(type: Delete) {
2226
delete rootProject.buildDir
23-
}
27+
}

Android-ExpandableTextView.iml renamed to expandabletextview-root.iml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.id="Android-ExpandableTextView" 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">
2+
<module external.linked.project.id="expandabletextview-root" 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">
33
<component name="FacetManager">
44
<facet type="java-gradle" name="Java-Gradle">
55
<configuration>

‎expandabletextview/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/build

‎expandabletextview/build.gradle‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
apply plugin: 'com.android.library'
2+
apply plugin: 'com.github.dcendents.android-maven'
3+
4+
def fullVersion = '1.0.0-SNAPSHOT'
5+
group = 'blogc.at.android'
6+
version = fullVersion
7+
8+
android {
9+
compileSdkVersion 23
10+
buildToolsVersion "23.0.2"
11+
12+
defaultConfig {
13+
minSdkVersion 14
14+
targetSdkVersion 23
15+
versionCode 1
16+
versionName fullVersion
17+
}
18+
buildTypes {
19+
release {
20+
minifyEnabled false
21+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
22+
}
23+
}
24+
}
25+
26+
repositories {
27+
mavenCentral()
28+
}
29+
30+
dependencies {
31+
compile fileTree(dir: 'libs', include: ['*.jar'])
32+
testCompile 'junit:junit:4.12'
33+
compile 'com.android.support:appcompat-v7:23.1.1'
34+
}
35+
36+
install {
37+
repositories.mavenInstaller {
38+
pom.project {
39+
name 'ExpandableTextView'
40+
description 'An expandable TextView for Android.'
41+
url 'https://github.com/Blogcat/Android-ExpandableTextView'
42+
inceptionYear '2016'
43+
44+
packaging 'aar'
45+
groupId group
46+
artifactId 'expandabletextview'
47+
version fullVersion
48+
49+
licenses {
50+
license {
51+
name 'The Apache Software License, Version 2.0'
52+
url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
53+
distribution 'repo'
54+
}
55+
}
56+
scm {
57+
connection 'https://github.com/Blogcat/Android-ExpandableTextView.git'
58+
url 'https://github.com/Blogcat/Android-ExpandableTextView'
59+
60+
}
61+
developers {
62+
developer {
63+
id 'cliffus'
64+
name 'Cliff Ophalvens'
65+
email 'cliff.ophalvens@gmail.com'
66+
}
67+
}
68+
}
69+
}
70+
}
71+
72+
bintray {
73+
user = bintray_user
74+
key = bintray_apikey
75+
configurations = ['archives']
76+
77+
dryRun = true
78+
79+
pkg {
80+
repo = 'maven'
81+
name = 'expandabletextview'
82+
userOrg = bintray_user
83+
licenses = ['Apache-2.0']
84+
websiteUrl = 'https://github.com/Blogcat/Android-ExpandableTextView'
85+
issueTrackerUrl = 'https://github.com/Blogcat/Android-ExpandableTextView/issues'
86+
vcsUrl = 'https://github.com/Blogcat/Android-ExpandableTextView.git'
87+
githubRepo = 'Blogcat/Android-ExpandableTextView'
88+
githubReleaseNotesFile = 'CHANGELOG.md'
89+
90+
version {
91+
name = fullVersion
92+
released = new Date()
93+
vcsTag = fullVersion
94+
}
95+
}
96+
}

‎expandabletextview/expandabletextview.iml‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<module external.linked.project.id=":expandabletextview" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="blogc.at.android" external.system.module.version="1.0.0-SNAPSHOT" type="JAVA_MODULE" version="4">
3+
<component name="FacetManager">
4+
<facet type="android-gradle" name="Android-Gradle">
5+
<configuration>
6+
<option name="GRADLE_PROJECT_PATH" value=":expandabletextview" />
7+
</configuration>
8+
</facet>
9+
<facet type="android" name="Android">
10+
<configuration>
11+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12+
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
13+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
14+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15+
<afterSyncTasks>
16+
<task>generateDebugSources</task>
17+
</afterSyncTasks>
18+
<option name="ALLOW_USER_CONFIGURATION" value="false" />
19+
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
20+
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
21+
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
22+
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
23+
<option name="LIBRARY_PROJECT" value="true" />
24+
</configuration>
25+
</facet>
26+
</component>
27+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
28+
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
29+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
30+
<exclude-output />
31+
<content url="file://$MODULE_DIR$">
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
33+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
34+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
69+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
70+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
81+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
97+
</content>
98+
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
99+
<orderEntry type="sourceFolder" forTests="false" />
100+
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
101+
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
102+
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
103+
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
104+
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
105+
</component>
106+
</module>

‎expandabletextview/gradle.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
POM_NAME=Expandable TextView
2+
POM_ARTIFACT_ID=expandabletextview
3+
POM_PACKAGING=aar

0 commit comments

Comments
 (0)