diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 525a210c28ca..318bc7fb083e 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -45,7 +45,6 @@ android { } compileSdkVersion rootProject.compileSdkVersion - buildToolsVersion rootProject.buildToolVersion defaultConfig { applicationId "org.wordpress.android" diff --git a/build.gradle b/build.gradle index 1e72fb75be23..31902c0a700f 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.1' + classpath 'com.android.tools.build:gradle:4.0.1' classpath 'com.automattic.android:fetchstyle:1.1' classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" @@ -22,10 +22,6 @@ buildscript { } } -plugins { - id 'com.gradle.build-scan' version '2.0.2' -} - ext { buildGutenbergMobileJSBundle = 1 } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6f26af127690..75b4a239dfe9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 30 15:10:36 EDT 2019 +#Tue Aug 25 22:29:19 EET 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/libs/analytics/WordPressAnalytics/build.gradle b/libs/analytics/WordPressAnalytics/build.gradle index 5ed45b9add0b..a3eacf1a147d 100644 --- a/libs/analytics/WordPressAnalytics/build.gradle +++ b/libs/analytics/WordPressAnalytics/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.1' + classpath 'com.android.tools.build:gradle:4.0.1' classpath 'com.novoda:bintray-release:0.8.1' } } @@ -27,7 +27,6 @@ dependencies { android { compileSdkVersion 28 - buildToolsVersion "28.0.3" defaultConfig { versionName "1.3.0" diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle index 423099c4041b..1717e6e0f758 100644 --- a/libs/editor/WordPressEditor/build.gradle +++ b/libs/editor/WordPressEditor/build.gradle @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.1' + classpath 'com.android.tools.build:gradle:4.0.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" } } diff --git a/libs/editor/example/build.gradle b/libs/editor/example/build.gradle index f363296177c2..e7e3d4a3abee 100644 --- a/libs/editor/example/build.gradle +++ b/libs/editor/example/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:4.0.1' } } diff --git a/libs/image-editor/ImageEditor/build.gradle b/libs/image-editor/ImageEditor/build.gradle index 30b8a5f1b93b..ff1f0ab1e38b 100644 --- a/libs/image-editor/ImageEditor/build.gradle +++ b/libs/image-editor/ImageEditor/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.1' + classpath 'com.android.tools.build:gradle:4.0.1' } } @@ -21,7 +21,6 @@ apply plugin: 'androidx.navigation.safeargs.kotlin' android { compileSdkVersion rootProject.compileSdkVersion - buildToolsVersion rootProject.buildToolVersion defaultConfig { minSdkVersion rootProject.minSdkVersion diff --git a/libs/login/WordPressLoginFlow/build.gradle b/libs/login/WordPressLoginFlow/build.gradle index 5eb03fdb41da..53223e1108db 100644 --- a/libs/login/WordPressLoginFlow/build.gradle +++ b/libs/login/WordPressLoginFlow/build.gradle @@ -10,7 +10,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.3' + classpath 'com.android.tools.build:gradle:4.0.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -29,7 +29,6 @@ repositories { android { compileSdkVersion 29 - buildToolsVersion "29.0.2" defaultConfig { minSdkVersion 21 diff --git a/libs/networking/WordPressNetworking/build.gradle b/libs/networking/WordPressNetworking/build.gradle index 27f2324df964..a91f9da318b0 100644 --- a/libs/networking/WordPressNetworking/build.gradle +++ b/libs/networking/WordPressNetworking/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.1' + classpath 'com.android.tools.build:gradle:4.0.1' } } @@ -19,7 +19,6 @@ apply plugin: 'maven' android { compileSdkVersion 28 - buildToolsVersion '28.0.3' defaultConfig { minSdkVersion 14 diff --git a/libs/stories-android b/libs/stories-android index ade9eadb799b..e6facdf9e17e 160000 --- a/libs/stories-android +++ b/libs/stories-android @@ -1 +1 @@ -Subproject commit ade9eadb799bb3135fd5d13d97f7b76adc31c119 +Subproject commit e6facdf9e17ef85839bb3fc8746fbdbdc6c9ed80 diff --git a/libs/utils/WordPressUtils/build.gradle b/libs/utils/WordPressUtils/build.gradle index d182429e1547..565a9e7e5f9e 100644 --- a/libs/utils/WordPressUtils/build.gradle +++ b/libs/utils/WordPressUtils/build.gradle @@ -8,15 +8,13 @@ buildscript { } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" - classpath 'com.android.tools.build:gradle:3.5.1' - classpath 'com.novoda:bintray-release:0.9.1' + classpath 'com.android.tools.build:gradle:4.0.1' } } apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' -apply plugin: 'com.novoda.bintray-release' repositories { google() @@ -50,7 +48,6 @@ android { useLibrary 'org.apache.http.legacy' compileSdkVersion 28 - buildToolsVersion '28.0.3' defaultConfig { versionName "1.27" @@ -86,16 +83,3 @@ android.libraryVariants.all { variant -> } } } - -publish { - artifactId = 'utils' - userOrg = 'wordpress-mobile' - groupId = 'org.wordpress' - uploadName = 'utils' - desc = 'Utils library for Android' - publishVersion = android.defaultConfig.versionName - licences = ['MIT', 'GPL'] - website = 'https://github.com/wordpress-mobile/WordPress-Utils-Android/' - dryRun = 'false' - autoPublish = 'true' -} diff --git a/settings.gradle b/settings.gradle index ffa909a31212..04a4cd545142 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,7 @@ +plugins { + id "com.gradle.enterprise" version "3.4.1" +} + include ':WordPress' include ':libs:stories-android:stories' project(':libs:stories-android:stories').projectDir = new File(rootProject.projectDir, 'libs/stories-android/stories') @@ -50,3 +54,4 @@ if (properties.getOrDefault('wp.BUILD_GUTENBERG_FROM_SOURCE', false).toBoolean() include ':react-native-reanimated' project(':react-native-reanimated').projectDir = new File(rootProject.projectDir, 'libs/gutenberg-mobile/gutenberg/node_modules/react-native-reanimated/android') } +