diff --git a/.gitignore b/.gitignore index 46ed28c05..d2137cb22 100644 --- a/.gitignore +++ b/.gitignore @@ -128,3 +128,5 @@ build/ # Ignore Gradle GUI config gradle-app.setting *.iml + +javadoc/ diff --git a/build.gradle b/build.gradle index e1c4af140..7fc99bf89 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b1bf8abb4..66b2b75d1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Sep 09 16:49:33 CEST 2016 +#Sun Aug 06 18:02:35 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/library/build.gradle b/library/build.gradle index c7ebe1629..3a931bdaa 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -6,7 +6,7 @@ repositories { android { compileSdkVersion 23 - buildToolsVersion "23.0.1" + buildToolsVersion '25.0.0' defaultConfig { minSdkVersion 9 diff --git a/library/gradle-mvn-push.gradle b/library/gradle-mvn-push.gradle index b7ec5818f..b29a1fc82 100644 --- a/library/gradle-mvn-push.gradle +++ b/library/gradle-mvn-push.gradle @@ -94,8 +94,8 @@ afterEvaluate { project -> task androidJavadocs(type: Javadoc) { source = android.sourceSets.main.java.srcDirs - classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) classpath += configurations.javadocDeps + classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) } task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) { @@ -108,8 +108,8 @@ afterEvaluate { project -> from android.sourceSets.main.java.sourceFiles } - artifacts { + /* artifacts { archives androidSourcesJar archives androidJavadocsJar - } + } */ } \ No newline at end of file diff --git a/sample/build.gradle b/sample/build.gradle index 4ceeab2f1..30164035a 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 23 - buildToolsVersion "23.0.1" + buildToolsVersion '25.0.0' defaultConfig { applicationId "com.alamkanak.weekview"