Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20af2f0c authored by Yigit Boyar's avatar Yigit Boyar
Browse files

Downgrade to java 1.6 

This CL removes java 1.7 code so that we can easily integrate
w/ Idea.

It also partially removes dependency on ModelAnalyzer for
interface generation so that we can call it from the Idea
plugin.

Change-Id: Id7616987f5660911e951ddf20dacd4f407dacbd9
parent ac5dc9a4

tools/data-binding/annotationprocessor/build.gradle

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
apply plugin: 'java'

apply plugin: 'maven'



sourceCompatibility = 1.7

targetCompatibility = 1.7



buildscript {

    repositories {

        mavenLocal()

tools/data-binding/baseLibrary/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ apply plugin: 'java' 
apply plugin: 'maven'

apply plugin: 'application'



sourceCompatibility = 1.7

mainClassName = "org.antlr.v4.Tool"

sourceCompatibility = javaTargetCompatibility

targetCompatibility = javaSourceCompatibility



buildscript {

    repositories {

tools/data-binding/build.gradle

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ ext.kotlinVersion = '0.10.195' 
ext.releaseVersion = "0.3"

ext.snapshotVersion = "0.3-SNAPSHOT"

ext.androidPluginVersion = "1.0.0"

ext.javaTargetCompatibility = 1.6

ext.javaSourceCompatibility = 1.6



subprojects {

    group = 'com.android.databinding'

tools/data-binding/compiler/build.gradle

+10 −1
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ apply plugin: "kotlin" 
apply plugin: 'maven'





sourceCompatibility = javaTargetCompatibility

targetCompatibility = javaSourceCompatibility



buildscript {

    repositories {
@@ -42,6 +44,13 @@ dependencies { 
    compile project(":xmlGrammar")

    testCompile "com.android.databinding:library:$version@jar"

}



task fatJar(type: Jar) {

    baseName = project.name + '-all'

    from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }

    with jar

}



uploadArchives {

    repositories {

        mavenDeployer {

tools/data-binding/compiler/src/main/java/com/android/databinding/BindingTarget.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import java.util.List; 
import java.util.Map;



public class BindingTarget {

    List<Binding> mBindings = new ArrayList<>();

    List<Binding> mBindings = new ArrayList<Binding>();

    ExprModel mModel;

    ModelClass mResolvedClass;

    // if this target presents itself in multiple layout files with different view types,