Merge pull request #33 from DevAhamed/AS-3.0-update

Update to new gradle plugin

Author: DevAhamed

build.gradle

@@ -1,15 +1,18 @@
 buildscript {
   repositories {
     jcenter()
+    google()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.3.3'
+    classpath 'com.android.tools.build:gradle:3.0.0'
+    classpath 'com.novoda:bintray-release:0.7.0'
   }
 }
 
 allprojects {
   repositories {
     jcenter()
+    google()
   }
 }
 

buildSrc/.gitignore

@@ -0,0 +1,9 @@
+*.iml
+.gradle
+/local.properties
+/.idea
+.DS_Store
+/build
+/captures
+.externalNativeBuild
+developer.properties

buildSrc/src/main/java/gradle/Config.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright 2017 Riyaz Ahamed
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package gradle;
+
+public class Config {
+
+  public static final int MIN_SDK = 9;
+  public static final int COMPILE_SDK = 25;
+  public static final int TARGET_SDK = COMPILE_SDK;
+
+  public static final String VERSION_NAME = "1.2.6";
+  public static final int VERSION_CODE = 126;
+
+  private static final String SUPPORT_LIB_VERSION = "25.4.0";
+  private static final String SUPPORT = "com.android.support:";
+
+  public static final String APP_COMPAT = SUPPORT + "appcompat-v7:" + SUPPORT_LIB_VERSION;
+  public static final String DESIGN = SUPPORT + "design:" + SUPPORT_LIB_VERSION;
+  public static final String RECYCLER_VIEW = SUPPORT + "recyclerview-v7:" + SUPPORT_LIB_VERSION;
+  public static final String CARD_VIEW = SUPPORT + "cardview-v7:" + SUPPORT_LIB_VERSION;
+  public static final String SUPPORT_ANNOTATION =
+      SUPPORT + "support-annotations:" + SUPPORT_LIB_VERSION;
+
+  public static final String USER_ORG = "devahamed";
+  public static final String GROUP_ID = "com.github.devahamed";
+  public static final String REPO_NAME = "MultiViewAdapter";
+  public static final String PUBLISH_VERSION = VERSION_NAME;
+  public static final String DESC =
+      "Recyclerview Adapter library to create composable view holders";
+  public static final String WEBSITE = "https://github.com/DevAhamed/MultiViewAdapter";
+
+  public static final String ARTIFACT_ID_CORE = "multi-view-adapter";
+  public static final String ARTIFACT_ID_DATA_BINDING = "multi-view-adapter-databinding";
+}

gradle.properties

@@ -14,4 +14,5 @@ org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+
+ org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.jar

@@ -1,4 +1,3 @@
-#Thu Sep 21 00:26:32 IST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.properties

@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

gradlew

@@ -14,27 +14,19 @@
  * limitations under the License.
  */
 
+import gradle.Config
+
 apply plugin: 'com.android.library'
 apply plugin: 'com.novoda.bintray-release'
 
-buildscript {
-  repositories {
-    jcenter()
-  }
-  dependencies {
-    classpath 'com.novoda:bintray-release:0.5.0'
-  }
-}
-
 android {
-  compileSdkVersion 25
-  buildToolsVersion "25.0.3"
+  compileSdkVersion Config.COMPILE_SDK
 
   defaultConfig {
-    minSdkVersion 9
-    targetSdkVersion 25
-    versionCode 1
-    versionName "1.2.3"
+    minSdkVersion Config.MIN_SDK
+    targetSdkVersion Config.TARGET_SDK
+    versionCode Config.VERSION_CODE
+    versionName Config.VERSION_NAME
 
     testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
   }
@@ -47,56 +39,74 @@ android {
 }
 
 dependencies {
-  compile project(':multi-view-adapter')
-  provided('com.android.databinding:library:1.3.1') {
+  implementation project(':multi-view-adapter')
+  implementation Config.RECYCLER_VIEW
+
+  compileOnly('com.android.databinding:library:1.3.1') {
     transitive = false
   }
-  provided('com.android.databinding:baseLibrary:2.3.2') {
+  compileOnly('com.android.databinding:baseLibrary:2.3.2') {
     transitive = false
   }
 }
 
 publish {
-  userOrg = 'devahamed'
-  groupId = 'com.github.devahamed'
-  artifactId = 'multi-view-adapter-databinding'
-  publishVersion = '1.2.3'
-  repoName = 'MultiViewAdapter'
-  desc = 'Additional DataBinding support for MultiViewAdapter'
-  website = 'https://github.com/DevAhamed/MultiViewAdapter'
+  userOrg = Config.USER_ORG
+  groupId = Config.GROUP_ID
+  artifactId = Config.ARTIFACT_ID_DATA_BINDING
+  publishVersion = Config.PUBLISH_VERSION
+  repoName = Config.REPO_NAME
+  desc = Config.DESC
+  website = Config.WEBSITE
 }
 
-if (project.hasProperty("android")) {
-  // Android libraries
-  task sourcesJar(type: Jar) {
-    classifier = 'sources'
-    from android.sourceSets.main.java.srcDirs
-  }
+afterEvaluate { project ->
 
-  task javadoc(type: Javadoc) {
-    source = android.sourceSets.main.java.srcDirs
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    failOnError true
-  }
-  afterEvaluate {
-    javadoc.classpath +=
-        files(android.libraryVariants.collect { variant -> variant.javaCompile.classpath.files
-        })
-  }
-} else {
-  // Java libraries
-  task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = 'sources'
-    from sourceSets.main.allSource
+  if (project.getPlugins().hasPlugin('com.android.application') || project.getPlugins().
+      hasPlugin('com.android.library')) {
+
+    task androidJavadocs(type: Javadoc) {
+      source = android.sourceSets.main.java.source
+      classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+    }
+
+    task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
+      classifier = 'javadoc'
+      from androidJavadocs.destinationDir
+    }
+
+    task androidSourcesJar(type: Jar) {
+      classifier = 'sources'
+      from android.sourceSets.main.java.source
+    }
+  } else {
+    task sourcesJar(type: Jar, dependsOn: classes) {
+      classifier = 'sources'
+      from sourceSets.main.allSource
+    }
+
+    task javadocJar(type: Jar, dependsOn: Javadoc) {
+      classifier = 'javadoc'
+      from Javadoc.destinationDir
+    }
   }
-}
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
-  classifier = 'javadoc'
-  from javadoc.destinationDir
-}
+  if (JavaVersion.current().isJava8Compatible()) {
+    allprojects {
+      tasks.withType(Javadoc) {
+        options.addStringOption('Xdoclint:none', '-quiet')
+      }
+    }
+  }
 
-artifacts {
-  archives javadocJar
-  archives sourcesJar
+  artifacts {
+    if (project.getPlugins().hasPlugin('com.android.application') || project.getPlugins().
+        hasPlugin('com.android.library')) {
+      archives androidSourcesJar
+      archives androidJavadocsJar
+    } else {
+      archives sourcesJar
+      archives javadocJar
+    }
+  }
 }