diff --git a/advancedrecyclerview/build.gradle b/advancedrecyclerview/build.gradle index b78f64d..089d19c 100644 --- a/advancedrecyclerview/build.gradle +++ b/advancedrecyclerview/build.gradle @@ -2,8 +2,8 @@ apply from: '../library.gradle' apply plugin: 'kotlin-android' dependencies { - compile project(':advancedrecyclerview-common') - compile project(':advancedrecyclerview-section') - compile project(':advancedrecyclerview-pagination') - compile project(':advancedrecyclerview-gesture') + compile project(':core') + compile project(':section') + compile project(':pagination') + compile project(':gesture') } \ No newline at end of file diff --git a/bintray-upload.gradle b/bintray-upload.gradle deleted file mode 100644 index 1e99c23..0000000 --- a/bintray-upload.gradle +++ /dev/null @@ -1,85 +0,0 @@ -apply plugin: 'com.jfrog.bintray' -apply plugin: 'com.github.dcendents.android-maven' - -group = GROUP_ID -version = VERSION_NAME - -bintray { - user = BINTRAY_USER - key = BINTRAY_API_KEY - - configurations = ['archives'] - pkg { - name = POM_NAME - repo = POM_REPO - desc = POM_DESCRIPTION - vcsUrl = POM_VCS_URL - licenses = ['Apache-2.0'] - publicDownloadNumbers = true - version { - name = VERSION_NAME - desc = POM_DESCRIPTION - gpg { - sign = true //Determines whether to GPG sign the files. The default is false - } - } - } -} - -install { - repositories.mavenInstaller { - pom { - project { - name POM_NAME - packaging PACKAGING - description POM_DESCRIPTION - url POM_URL - - scm { - url POM_URL - connection POM_SCM_CONNECTION - developerConnection POM_SCM_DEV_CONNECTION - } - - licenses { - license { - name POM_LICENCE_NAME - url POM_LICENCE_URL - distribution POM_LICENCE_DIST - } - } - - developers { - developer { - id POM_DEVELOPER_ID - name POM_DEVELOPER_NAME - } - } - } - } - } -} - -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 -} - -dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) -} \ No newline at end of file diff --git a/advancedrecyclerview-common/.gitignore b/core/.gitignore similarity index 100% rename from advancedrecyclerview-common/.gitignore rename to core/.gitignore diff --git a/advancedrecyclerview-common/build.gradle b/core/build.gradle similarity index 100% rename from advancedrecyclerview-common/build.gradle rename to core/build.gradle diff --git a/advancedrecyclerview-common/proguard-rules.pro b/core/proguard-rules.pro similarity index 100% rename from advancedrecyclerview-common/proguard-rules.pro rename to core/proguard-rules.pro diff --git a/advancedrecyclerview-common/src/androidTest/java/com/github/stephenvinouze/advancedrecyclerview_common/ApplicationTest.java b/core/src/androidTest/java/com/github/stephenvinouze/advancedrecyclerview_core/ApplicationTest.java similarity index 83% rename from advancedrecyclerview-common/src/androidTest/java/com/github/stephenvinouze/advancedrecyclerview_common/ApplicationTest.java rename to core/src/androidTest/java/com/github/stephenvinouze/advancedrecyclerview_core/ApplicationTest.java index 068597b..eb721a3 100644 --- a/advancedrecyclerview-common/src/androidTest/java/com/github/stephenvinouze/advancedrecyclerview_common/ApplicationTest.java +++ b/core/src/androidTest/java/com/github/stephenvinouze/advancedrecyclerview_core/ApplicationTest.java @@ -1,4 +1,4 @@ -package com.github.stephenvinouze.advancedrecyclerview_common; +package com.github.stephenvinouze.advancedrecyclerview_core; import android.app.Application; import android.test.ApplicationTestCase; diff --git a/advancedrecyclerview-common/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml similarity index 84% rename from advancedrecyclerview-common/src/main/AndroidManifest.xml rename to core/src/main/AndroidManifest.xml index 1813a91..22f5696 100644 --- a/advancedrecyclerview-common/src/main/AndroidManifest.xml +++ b/core/src/main/AndroidManifest.xml @@ -1 +1 @@ - + diff --git a/advancedrecyclerview-common/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_common/adapters/RecyclerAdapter.kt b/core/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_core/adapters/RecyclerAdapter.kt similarity index 100% rename from advancedrecyclerview-common/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_common/adapters/RecyclerAdapter.kt rename to core/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_core/adapters/RecyclerAdapter.kt diff --git a/advancedrecyclerview-common/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_common/callbacks/ClickCallback.kt b/core/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_core/callbacks/ClickCallback.kt similarity index 100% rename from advancedrecyclerview-common/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_common/callbacks/ClickCallback.kt rename to core/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_core/callbacks/ClickCallback.kt diff --git a/advancedrecyclerview-common/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_common/extensions/Collection.kt b/core/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_core/extensions/Collection.kt similarity index 100% rename from advancedrecyclerview-common/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_common/extensions/Collection.kt rename to core/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_core/extensions/Collection.kt diff --git a/advancedrecyclerview-common/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_common/views/BaseViewHolder.kt b/core/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_core/views/BaseViewHolder.kt similarity index 100% rename from advancedrecyclerview-common/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_common/views/BaseViewHolder.kt rename to core/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_core/views/BaseViewHolder.kt diff --git a/advancedrecyclerview-common/src/main/res/layout/section_view.xml b/core/src/main/res/layout/section_view.xml similarity index 100% rename from advancedrecyclerview-common/src/main/res/layout/section_view.xml rename to core/src/main/res/layout/section_view.xml diff --git a/advancedrecyclerview-common/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml similarity index 100% rename from advancedrecyclerview-common/src/main/res/values/strings.xml rename to core/src/main/res/values/strings.xml diff --git a/advancedrecyclerview-common/src/test/java/com/github/stephenvinouze/advancedrecyclerview_common/ExampleUnitTest.java b/core/src/test/java/com/github/stephenvinouze/advancedrecyclerview_core/ExampleUnitTest.java similarity index 81% rename from advancedrecyclerview-common/src/test/java/com/github/stephenvinouze/advancedrecyclerview_common/ExampleUnitTest.java rename to core/src/test/java/com/github/stephenvinouze/advancedrecyclerview_core/ExampleUnitTest.java index 85c497b..83ae04d 100644 --- a/advancedrecyclerview-common/src/test/java/com/github/stephenvinouze/advancedrecyclerview_common/ExampleUnitTest.java +++ b/core/src/test/java/com/github/stephenvinouze/advancedrecyclerview_core/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package com.github.stephenvinouze.advancedrecyclerview_common; +package com.github.stephenvinouze.advancedrecyclerview_core; import org.junit.Test; diff --git a/advancedrecyclerview-gesture/.gitignore b/gesture/.gitignore similarity index 100% rename from advancedrecyclerview-gesture/.gitignore rename to gesture/.gitignore diff --git a/advancedrecyclerview-gesture/build.gradle b/gesture/build.gradle similarity index 79% rename from advancedrecyclerview-gesture/build.gradle rename to gesture/build.gradle index b869b4a..b67a708 100644 --- a/advancedrecyclerview-gesture/build.gradle +++ b/gesture/build.gradle @@ -5,5 +5,5 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - compile project(path: ':advancedrecyclerview-section') + compile project(path: ':section') } \ No newline at end of file diff --git a/advancedrecyclerview-gesture/proguard-rules.pro b/gesture/proguard-rules.pro similarity index 100% rename from advancedrecyclerview-gesture/proguard-rules.pro rename to gesture/proguard-rules.pro diff --git a/advancedrecyclerview-gesture/src/androidTest/java/com/github/stephenvinouze/advancedrecyclerview_gesture/ApplicationTest.java b/gesture/src/androidTest/java/com/github/stephenvinouze/advancedrecyclerview_gesture/ApplicationTest.java similarity index 100% rename from advancedrecyclerview-gesture/src/androidTest/java/com/github/stephenvinouze/advancedrecyclerview_gesture/ApplicationTest.java rename to gesture/src/androidTest/java/com/github/stephenvinouze/advancedrecyclerview_gesture/ApplicationTest.java diff --git a/advancedrecyclerview-gesture/src/main/AndroidManifest.xml b/gesture/src/main/AndroidManifest.xml similarity index 100% rename from advancedrecyclerview-gesture/src/main/AndroidManifest.xml rename to gesture/src/main/AndroidManifest.xml diff --git a/advancedrecyclerview-gesture/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_gesture/callbacks/GestureCallback.kt b/gesture/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_gesture/callbacks/GestureCallback.kt similarity index 100% rename from advancedrecyclerview-gesture/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_gesture/callbacks/GestureCallback.kt rename to gesture/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_gesture/callbacks/GestureCallback.kt diff --git a/advancedrecyclerview-gesture/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_gesture/extensions/Gesture.kt b/gesture/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_gesture/extensions/Gesture.kt similarity index 100% rename from advancedrecyclerview-gesture/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_gesture/extensions/Gesture.kt rename to gesture/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_gesture/extensions/Gesture.kt diff --git a/advancedrecyclerview-gesture/src/main/res/values/strings.xml b/gesture/src/main/res/values/strings.xml similarity index 100% rename from advancedrecyclerview-gesture/src/main/res/values/strings.xml rename to gesture/src/main/res/values/strings.xml diff --git a/advancedrecyclerview-gesture/src/test/java/com/github/stephenvinouze/advancedrecyclerview_gesture/ExampleUnitTest.java b/gesture/src/test/java/com/github/stephenvinouze/advancedrecyclerview_gesture/ExampleUnitTest.java similarity index 100% rename from advancedrecyclerview-gesture/src/test/java/com/github/stephenvinouze/advancedrecyclerview_gesture/ExampleUnitTest.java rename to gesture/src/test/java/com/github/stephenvinouze/advancedrecyclerview_gesture/ExampleUnitTest.java diff --git a/gradle.properties b/gradle.properties index 93ca9cf..30dd47a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,7 +28,7 @@ ANDROID_BUILD_TOOLS_VERSION=23.0.2 POM_NAME=AdvancedRecyclerView POM_REPO=maven -POM_DESCRIPTION=A Kotlin library that both ease and enhance the use of RecyclerView +POM_DESCRIPTION=An easy, empowering Kotlin library for RecyclerView POM_URL=https://github.com/StephenVinouze/AdvancedRecyclerView POM_VCS_URL=https://github.com/StephenVinouze/AdvancedRecyclerView.git POM_SCM_CONNECTION=scm:git@github.com:StephenVinouze/AdvancedRecyclerView.git diff --git a/library.gradle b/library.gradle index 3873695..0c5c041 100644 --- a/library.gradle +++ b/library.gradle @@ -22,5 +22,3 @@ android { androidTest.java.srcDirs += 'src/androidTest/kotlin' } } - -apply from: '../bintray-upload.gradle' diff --git a/advancedrecyclerview-pagination/.gitignore b/pagination/.gitignore similarity index 100% rename from advancedrecyclerview-pagination/.gitignore rename to pagination/.gitignore diff --git a/advancedrecyclerview-pagination/build.gradle b/pagination/build.gradle similarity index 79% rename from advancedrecyclerview-pagination/build.gradle rename to pagination/build.gradle index b869b4a..b67a708 100644 --- a/advancedrecyclerview-pagination/build.gradle +++ b/pagination/build.gradle @@ -5,5 +5,5 @@ dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - compile project(path: ':advancedrecyclerview-section') + compile project(path: ':section') } \ No newline at end of file diff --git a/advancedrecyclerview-pagination/proguard-rules.pro b/pagination/proguard-rules.pro similarity index 100% rename from advancedrecyclerview-pagination/proguard-rules.pro rename to pagination/proguard-rules.pro diff --git a/advancedrecyclerview-pagination/src/androidTest/java/com/github/stephenvinouze/advancedrecyclerview_pagination/ApplicationTest.java b/pagination/src/androidTest/java/com/github/stephenvinouze/advancedrecyclerview_pagination/ApplicationTest.java similarity index 100% rename from advancedrecyclerview-pagination/src/androidTest/java/com/github/stephenvinouze/advancedrecyclerview_pagination/ApplicationTest.java rename to pagination/src/androidTest/java/com/github/stephenvinouze/advancedrecyclerview_pagination/ApplicationTest.java diff --git a/advancedrecyclerview-pagination/src/main/AndroidManifest.xml b/pagination/src/main/AndroidManifest.xml similarity index 100% rename from advancedrecyclerview-pagination/src/main/AndroidManifest.xml rename to pagination/src/main/AndroidManifest.xml diff --git a/advancedrecyclerview-pagination/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_pagination/callbacks/PaginationCallback.kt b/pagination/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_pagination/callbacks/PaginationCallback.kt similarity index 100% rename from advancedrecyclerview-pagination/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_pagination/callbacks/PaginationCallback.kt rename to pagination/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_pagination/callbacks/PaginationCallback.kt diff --git a/advancedrecyclerview-pagination/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_pagination/extensions/Pagination.kt b/pagination/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_pagination/extensions/Pagination.kt similarity index 100% rename from advancedrecyclerview-pagination/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_pagination/extensions/Pagination.kt rename to pagination/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_pagination/extensions/Pagination.kt diff --git a/advancedrecyclerview-pagination/src/main/res/values/strings.xml b/pagination/src/main/res/values/strings.xml similarity index 100% rename from advancedrecyclerview-pagination/src/main/res/values/strings.xml rename to pagination/src/main/res/values/strings.xml diff --git a/advancedrecyclerview-pagination/src/test/java/com/github/stephenvinouze/advancedrecyclerview_pagination/ExampleUnitTest.java b/pagination/src/test/java/com/github/stephenvinouze/advancedrecyclerview_pagination/ExampleUnitTest.java similarity index 100% rename from advancedrecyclerview-pagination/src/test/java/com/github/stephenvinouze/advancedrecyclerview_pagination/ExampleUnitTest.java rename to pagination/src/test/java/com/github/stephenvinouze/advancedrecyclerview_pagination/ExampleUnitTest.java diff --git a/advancedrecyclerview-section/.gitignore b/section/.gitignore similarity index 100% rename from advancedrecyclerview-section/.gitignore rename to section/.gitignore diff --git a/advancedrecyclerview-section/build.gradle b/section/build.gradle similarity index 85% rename from advancedrecyclerview-section/build.gradle rename to section/build.gradle index 2b0da60..6f2554c 100644 --- a/advancedrecyclerview-section/build.gradle +++ b/section/build.gradle @@ -7,5 +7,5 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile "com.nhaarman:mockito-kotlin:0.4.0" testCompile 'junit:junit:4.12' - compile project(path: ':advancedrecyclerview-common') + compile project(path: ':core') } \ No newline at end of file diff --git a/advancedrecyclerview-section/proguard-rules.pro b/section/proguard-rules.pro similarity index 100% rename from advancedrecyclerview-section/proguard-rules.pro rename to section/proguard-rules.pro diff --git a/advancedrecyclerview-section/src/androidTest/java/com/github/stephenvinouze/advancedrecyclerview_section/ApplicationTest.java b/section/src/androidTest/java/com/github/stephenvinouze/advancedrecyclerview_section/ApplicationTest.java similarity index 100% rename from advancedrecyclerview-section/src/androidTest/java/com/github/stephenvinouze/advancedrecyclerview_section/ApplicationTest.java rename to section/src/androidTest/java/com/github/stephenvinouze/advancedrecyclerview_section/ApplicationTest.java diff --git a/advancedrecyclerview-section/src/main/AndroidManifest.xml b/section/src/main/AndroidManifest.xml similarity index 100% rename from advancedrecyclerview-section/src/main/AndroidManifest.xml rename to section/src/main/AndroidManifest.xml diff --git a/advancedrecyclerview-section/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_section/adapters/RecyclerSectionAdapter.kt b/section/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_section/adapters/RecyclerSectionAdapter.kt similarity index 100% rename from advancedrecyclerview-section/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_section/adapters/RecyclerSectionAdapter.kt rename to section/src/main/kotlin/com/github/stephenvinouze/advancedrecyclerview_section/adapters/RecyclerSectionAdapter.kt diff --git a/advancedrecyclerview-section/src/main/res/values/strings.xml b/section/src/main/res/values/strings.xml similarity index 100% rename from advancedrecyclerview-section/src/main/res/values/strings.xml rename to section/src/main/res/values/strings.xml diff --git a/advancedrecyclerview-section/src/test/kotlin/com/github/stephenvinouze/advancedrecyclerview_section/SectionTests.kt b/section/src/test/kotlin/com/github/stephenvinouze/advancedrecyclerview_section/SectionTests.kt similarity index 100% rename from advancedrecyclerview-section/src/test/kotlin/com/github/stephenvinouze/advancedrecyclerview_section/SectionTests.kt rename to section/src/test/kotlin/com/github/stephenvinouze/advancedrecyclerview_section/SectionTests.kt diff --git a/settings.gradle b/settings.gradle index 6c636ce..3a426d2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':sample', ':advancedrecyclerview', ':advancedrecyclerview-common', ':advancedrecyclerview-section', ':advancedrecyclerview-pagination', ':advancedrecyclerview-gesture' +include ':sample', ':advancedrecyclerview', ':core', ':section', ':pagination', ':gesture'