diff --git a/android/build.gradle b/android/build.gradle index 8ef83685..d8b20849 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,31 +1,28 @@ -apply plugin: "com.jfrog.bintray" +apply plugin: 'com.jfrog.bintray' apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'maven-publish' -targetCompatibility = '1.7' -sourceCompatibility = '1.7' - version = '1.4.1' group = 'com.facebook.yoga.android' android { - compileSdkVersion 19 - buildToolsVersion "19.1.0" + compileSdkVersion rootProject.compileSdkVersion + buildToolsVersion rootProject.buildToolsVersion defaultConfig { - minSdkVersion 15 - targetSdkVersion 19 + minSdkVersion rootProject.minSdkVersion + targetSdkVersion rootProject.targetSdkVersion } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 + targetCompatibility rootProject.targetCompatibilityVersion + sourceCompatibility rootProject.sourceCompatibilityVersion } } dependencies { - compile 'com.facebook.yoga:yoga:1.4.1' + compile project(':yoga') } task sourcesJar(type: Jar) { @@ -46,7 +43,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) { } ext { - bintrayName = "com.facebook.yoga.android:yoga-layout" + bintrayName = 'com.facebook.yoga.android:yoga-layout' } apply from: rootProject.file('gradle/android-jcenter-install.gradle') diff --git a/build.gradle b/build.gradle index 45df8f9b..41a925fa 100644 --- a/build.gradle +++ b/build.gradle @@ -18,15 +18,18 @@ buildscript { allprojects { repositories { jcenter() - flatDir { - dirs "${rootDir}/lib/jsr-305" - dirs "${rootDir}/lib/soloader" - dirs "${rootDir}/lib/appcompat" - dirs "${rootDir}/lib/android-support" - } } } +ext { + minSdkVersion = 15 + targetSdkVersion = 25 + compileSdkVersion = 25 + buildToolsVersion = '25.0.2' + sourceCompatibilityVersion = JavaVersion.VERSION_1_7 + targetCompatibilityVersion = JavaVersion.VERSION_1_7 +} + task clean(type: Delete) { delete rootProject.buildDir } diff --git a/java/build.gradle b/java/build.gradle index 0233c095..71611fc3 100644 --- a/java/build.gradle +++ b/java/build.gradle @@ -3,9 +3,6 @@ apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'maven-publish' -targetCompatibility = '1.7' -sourceCompatibility = '1.7' - version = '1.4.2' group = 'com.facebook.yoga' @@ -16,17 +13,17 @@ task buckBuildAndCopy(type: Exec) { } android { - compileSdkVersion 19 - buildToolsVersion "19.1.0" + compileSdkVersion rootProject.compileSdkVersion + buildToolsVersion rootProject.buildToolsVersion defaultConfig { - minSdkVersion 15 - targetSdkVersion 19 + minSdkVersion rootProject.minSdkVersion + targetSdkVersion rootProject.targetSdkVersion } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 + targetCompatibility rootProject.targetCompatibilityVersion + sourceCompatibility rootProject.sourceCompatibilityVersion } sourceSets { @@ -42,9 +39,9 @@ android { preBuild.dependsOn buckBuildAndCopy dependencies { - compile(name: 'jsr305') - compile(name: 'soloader-0.1.0', ext: 'aar') - provided(project(':yoga:proguard-annotations')) + compile 'com.google.code.findbugs:jsr305:3.0.1' + compile 'com.facebook.soloader:soloader:0.2.0' + provided project(':yoga:proguard-annotations') } task sourcesJar(type: Jar) { @@ -65,7 +62,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) { } ext { - bintrayName = "com.facebook.yoga:yoga" + bintrayName = 'com.facebook.yoga:yoga' } apply from: rootProject.file('gradle/android-jcenter-install.gradle')