From a93cdf52cc3b7eff1e2d4cf436b8f8dbc3cf14a2 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 29 Feb 2020 18:37:09 -0800 Subject: Update versions --- .idea/jarRepositories.xml | 30 ++++++++++++++++++++++++++++++ app/build.gradle | 14 +++++++------- build.gradle | 4 ---- buildSrc/src/main/kotlin/Versions.kt | 6 +++--- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 42 insertions(+), 16 deletions(-) create mode 100644 .idea/jarRepositories.xml diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 00000000..eb2873e7 --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 63ada71b..ca23c928 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,20 +10,20 @@ apply plugin: 'com.gladed.androidgitversion' buildscript { repositories { jcenter() + maven { url "https://plugins.gradle.org/m2/" } } dependencies { - classpath "com.moowork.gradle:gradle-node-plugin:${Versions.nodeGradle}" + classpath "com.github.node-gradle:gradle-node-plugin:${Versions.nodeGradle}" } } -apply plugin: com.moowork.gradle.node.NodePlugin +apply plugin: 'com.github.node-gradle.node' apply from: '../spotless.gradle' group = APP_GROUP android { compileSdkVersion Versions.targetSdk - buildToolsVersion kau.Versions.buildTools androidGitVersion { codeFormat = 'MMNNPPXX' @@ -75,8 +75,8 @@ android { textOutput 'stdout' } - viewBinding { - enabled = true + buildFeatures { + viewBinding = true } def testKeystoreFile = file('../files/test.keystore') @@ -199,8 +199,8 @@ android { } node { - version = '12.4.0' - npmVersion = '6.9.0' + version = '13.8.0' + npmVersion = '6.13.7' download = true nodeModulesDir = file("${project.projectDir}/src/web") } diff --git a/build.gradle b/build.gradle index cc64b047..2faeee34 100644 --- a/build.gradle +++ b/build.gradle @@ -18,10 +18,6 @@ buildscript { wrapper.setDistributionType(Wrapper.DistributionType.ALL) } -task clean(type: Delete) { - delete rootProject.buildDir -} - task generateChangelogMd() { def changelog = kau.ChangelogGenerator.generate("${project.rootDir}/app/src/main/res/xml/frost_changelog.xml", "${project.rootDir}/docs/Changelog.md") // If we have no changelog, something is wrong diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 75544cfb..dedca472 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -14,7 +14,7 @@ object Versions { const val mockk = "1.9.3" // https://github.com/jhy/jsoup/releases - const val jsoup = "1.12.1" + const val jsoup = "1.13.1" // https://square.github.io/leakcanary/changelog/ const val leakCanary = "2.2" // https://square.github.io/okhttp/changelog/ @@ -25,6 +25,6 @@ object Versions { const val roboelectric = "4.3" // https://github.com/davemorrissey/subsampling-scale-image-view#quick-start const val scaleImageView = "3.10.0" - // https://github.com/srs/gradle-node-plugin/releases - const val nodeGradle = "1.3.1" + // https://github.com/node-gradle/gradle-node-plugin/releases + const val nodeGradle = "2.2.3" } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 1fe7b114..3060a721 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,7 +16,7 @@ org.gradle.daemon = true APP_ID=Frost APP_GROUP=com.pitchedapps -KAU=5038b93 +KAU=eb4c4ae android.useAndroidX=true android.enableJetifier=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d31f47c5..beef26ac 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip -- cgit v1.2.3