[General] Split bindings into separate library module & fixed issue with nested converter generation

Author: KaustubhPatange

.github/workflows/build.yml

@@ -11,9 +11,5 @@ jobs:
           java-version: 11
       - run: chmod +x gradlew
       - run: chmod -R 777 ./
-      - name: Build Library
-        run: ./gradlew autobindings:build
-      - name: Build Compiler
-        run: ./gradlew autobindings-compiler:build
-      - name: Run Tests
-        run: ./gradlew lint:test
+      # Build project & run tests
+      - run: ./gradlew build

.gitignore

@@ -14,4 +14,5 @@
 .externalNativeBuild
 .cxx
 /key.asc
-*.gpg
+*.gpg
+lint-report.html

README.md

@@ -0,0 +1,20 @@
+apply plugin: 'java-library'
+apply plugin: 'kotlin'
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+   // implementation 'com.android.support:support-annotations:28.0.0'
+    implementation 'androidx.annotation:annotation:1.1.0'
+}
+
+sourceCompatibility = "1.7"
+targetCompatibility = "1.7"
+
+ext {
+    PUBLISH_GROUP_ID = 'io.github.kaustubhpatange'
+    PUBLISH_ARTIFACT_ID = 'autobindings-annotations-converter-core'
+    PUBLISH_VERSION = versions.library
+}
+
+apply from: rootProject.file('publish.gradle')

autobindings-annotations/.gitignore renamed to autobindings-annotations-converter-core/.gitignore

@@ -0,0 +1,5 @@
+package com.kpstv.bindings
+
+enum class ConverterType {
+    GSON, MOSHI, KOTLIN_SERIALIZATION
+}

autobindings-annotations-converter-core/build.gradle

@@ -13,7 +13,7 @@ targetCompatibility = "1.7"
 
 ext {
     PUBLISH_GROUP_ID = 'io.github.kaustubhpatange'
-    PUBLISH_ARTIFACT_ID = 'autobindings-annotations'
+    PUBLISH_ARTIFACT_ID = 'autobindings-annotations-recyclerview'
     PUBLISH_VERSION = versions.library
 }
 

autobindings-annotations-converter-core/src/main/java/com/kpstv/bindings/ConverterType.kt

@@ -0,0 +1,21 @@
+apply plugin: 'java-library'
+apply plugin: 'kotlin'
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+   // implementation 'com.android.support:support-annotations:28.0.0'
+    implementation 'androidx.annotation:annotation:1.1.0'
+    api project(":autobindings-annotations-converter-core")
+}
+
+sourceCompatibility = "1.7"
+targetCompatibility = "1.7"
+
+ext {
+    PUBLISH_GROUP_ID = 'io.github.kaustubhpatange'
+    PUBLISH_ARTIFACT_ID = 'autobindings-annotations-room'
+    PUBLISH_VERSION = versions.library
+}
+
+apply from: rootProject.file('publish.gradle')

autobindings-compiler/.gitignore renamed to autobindings-annotations-recyclerview/.gitignore

@@ -47,17 +47,4 @@ annotation class AutoGeneratePairConverter(val keyClass: KClass<*>, val using: C
  */
 @Target(AnnotationTarget.FIELD)
 @Retention(AnnotationRetention.SOURCE)
-annotation class IgnoreConverter
-
-/**
- * Automatically generate [SQLDelightAdapter] for SQLDelight.
- *
- * @see <a href="https://github.com/KaustubhPatange/AutoBindings/wiki/ColumnAdapter-Generation">Documentation</a>
- */
-@Target(AnnotationTarget.CLASS)
-@Retention(AnnotationRetention.SOURCE)
-annotation class AutoGenerateSQLDelightAdapters(val using: ConverterType)
-
-enum class ConverterType {
-    GSON, MOSHI, KOTLIN_SERIALIZATION
-}
+annotation class IgnoreConverter

autobindings-annotations/build.gradle renamed to autobindings-annotations-recyclerview/build.gradle

@@ -0,0 +1 @@
+/build

autobindings-annotations/src/main/java/com/kpstv/bindings/Annotations.kt renamed to autobindings-annotations-recyclerview/src/main/java/com/kpstv/bindings/Annotations.kt

@@ -0,0 +1,21 @@
+apply plugin: 'java-library'
+apply plugin: 'kotlin'
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+   // implementation 'com.android.support:support-annotations:28.0.0'
+    implementation 'androidx.annotation:annotation:1.1.0'
+    api project(":autobindings-annotations-converter-core")
+}
+
+sourceCompatibility = "1.7"
+targetCompatibility = "1.7"
+
+ext {
+    PUBLISH_GROUP_ID = 'io.github.kaustubhpatange'
+    PUBLISH_ARTIFACT_ID = 'autobindings-annotations-sqldelight'
+    PUBLISH_VERSION = versions.library
+}
+
+apply from: rootProject.file('publish.gradle')

autobindings-annotations/src/main/java/com/kpstv/bindings/ClickAnnotation.kt renamed to autobindings-annotations-recyclerview/src/main/java/com/kpstv/bindings/ClickAnnotation.kt

@@ -0,0 +1,10 @@
+package com.kpstv.bindings
+
+/**
+ * Automatically generate [SQLDelightAdapter] for SQLDelight.
+ *
+ * @see <a href="https://github.com/KaustubhPatange/AutoBindings/wiki/ColumnAdapter-Generation">Documentation</a>
+ */
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.SOURCE)
+annotation class AutoGenerateSQLDelightAdapters(val using: ConverterType)

autobindings-annotations/src/main/java/com/kpstv/bindings/DiffUtilAnnotation.kt renamed to autobindings-annotations-recyclerview/src/main/java/com/kpstv/bindings/DiffUtilAnnotation.kt

@@ -0,0 +1 @@
+/build

autobindings-annotations/src/main/java/com/kpstv/bindings/GlideLoad.kt renamed to autobindings-annotations-recyclerview/src/main/java/com/kpstv/bindings/GlideLoad.kt

@@ -9,30 +9,30 @@ android {
     buildFeatures.buildConfig false
     defaultConfig {
         minSdkVersion 16
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
     }
 
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
-    api project(":autobindings-annotations")
+    api project(":autobindings-annotations-recyclerview")
     lintPublish project(":lint")
 }
 
 ext {
     PUBLISH_GROUP_ID = 'io.github.kaustubhpatange'
-    PUBLISH_ARTIFACT_ID = 'autobindings'
+    PUBLISH_ARTIFACT_ID = 'autobindings-recyclerview'
     PUBLISH_VERSION = versions.library
 }
 

autobindings-annotations/src/main/java/com/kpstv/bindings/RecyclerViewAdapter.kt renamed to autobindings-annotations-recyclerview/src/main/java/com/kpstv/bindings/RecyclerViewAdapter.kt

@@ -0,0 +1 @@
+/build

autobindings-annotations/src/main/java/com/kpstv/bindings/RecyclerViewListAdapter.kt renamed to autobindings-annotations-recyclerview/src/main/java/com/kpstv/bindings/RecyclerViewListAdapter.kt

@@ -0,0 +1,39 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'maven-publish'
+
+android {
+    compileSdkVersion 30
+
+    buildFeatures.buildConfig false
+    defaultConfig {
+        minSdkVersion 16
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
+    api project(":autobindings-annotations-room")
+    lintPublish project(":lint")
+}
+
+ext {
+    PUBLISH_GROUP_ID = 'io.github.kaustubhpatange'
+    PUBLISH_ARTIFACT_ID = 'autobindings-room'
+    PUBLISH_VERSION = versions.library
+}
+
+apply from: "${rootProject.projectDir}/publish.gradle"

autobindings/.gitignore renamed to autobindings-annotations-room/.gitignore

@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.kpstv.bindings"/>

autobindings-annotations-room/build.gradle

@@ -0,0 +1 @@
+/build

autobindings-annotations/src/main/java/com/kpstv/bindings/AutoGenerateConverter.kt renamed to autobindings-annotations-room/src/main/java/com/kpstv/bindings/AutoGenerateConverter.kt

@@ -0,0 +1,39 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'maven-publish'
+
+android {
+    compileSdkVersion 30
+
+    buildFeatures.buildConfig false
+    defaultConfig {
+        minSdkVersion 16
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
+    api project(":autobindings-annotations-sqldelight")
+    lintPublish project(":lint")
+}
+
+ext {
+    PUBLISH_GROUP_ID = 'io.github.kaustubhpatange'
+    PUBLISH_ARTIFACT_ID = 'autobindings-sqldelight'
+    PUBLISH_VERSION = versions.library
+}
+
+apply from: "${rootProject.projectDir}/publish.gradle"

autobindings-annotations-sqldelight/.gitignore

@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.kpstv.bindings"/>

autobindings-annotations-sqldelight/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     ext.androidGradlePlugin = "7.0.0"
     ext.lintVersion = "30.0.0" // Lint version = 23.0.0 + androidGradlePlugin version
     ext.versions = [
-            'library': "1.1-beta04" // TODO: Increment version for every new release & run the task at bottom to publish it
+            'library': "1.1-beta05" // TODO: Increment version for every new release & run the task at bottom to publish it
     ]
     repositories {
         google()
@@ -33,24 +33,39 @@ task clean(type: Delete) {
 }
 
 tasks.register("publishAllLibrariesToMavenCentral") {
-    def t1 = tasks.getByPath("autobindings-annotations:publish")
-    def t2 = tasks.getByPath("autobindings-compiler:publish")
+    def t1 = tasks.getByPath("autobindings-recyclerview:publish")
+    def t2 = tasks.getByPath("compiler:publish")
     def t3 = tasks.getByPath("autobindings-room-noop:publish")
-    def t4 = tasks.getByPath("autobindings:publish")
+    def t4 = tasks.getByPath("autobindings-room:publish")
+    def t5 = tasks.getByPath("autobindings-sqldelight:publish")
+    def t6 = tasks.getByPath("autobindings-annotations-converter-core:publish")
+    def t7 = tasks.getByPath("autobindings-annotations-room:publish")
+    def t8 = tasks.getByPath("autobindings-annotations-sqldelight:publish")
+    def t9 = tasks.getByPath("autobindings-annotations-recyclerview:publish")
 
-    def t5 = tasks.getByName("closeRepository")
-    def t6 = tasks.getByName("releaseRepository")
+    def t10 = tasks.getByName("closeRepository")
+    def t11 = tasks.getByName("releaseRepository")
 
     t2.mustRunAfter(t1)
     t3.mustRunAfter(t2)
     t4.mustRunAfter(t3)
     t5.mustRunAfter(t4)
     t6.mustRunAfter(t5)
+    t7.mustRunAfter(t6)
+    t8.mustRunAfter(t7)
+    t9.mustRunAfter(t8)
+    t10.mustRunAfter(t9)
+    t11.mustRunAfter(t10)
 
     dependsOn(t1)
     dependsOn(t2)
     dependsOn(t3)
     dependsOn(t4)
     dependsOn(t5)
     dependsOn(t6)
+    dependsOn(t7)
+    dependsOn(t8)
+    dependsOn(t9)
+    dependsOn(t10)
+    dependsOn(t11)
 }

autobindings-annotations-sqldelight/src/main/java/com/kpstv/bindings/AutoGenerateSQLDelight.kt

@@ -0,0 +1 @@
+/build

autobindings-recyclerview/.gitignore

@@ -5,7 +5,11 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.squareup:javapoet:1.12.1'
-    compileOnly project(":autobindings-annotations")
+
+    implementation project(":autobindings-annotations-recyclerview")
+    implementation project(":autobindings-annotations-room")
+    implementation project(":autobindings-annotations-sqldelight")
+    
     compileOnly 'com.google.android.material:material:1.2.0-beta01'
 }