diff options
Diffstat (limited to 'buildSrc/src/main')
-rw-r--r-- | buildSrc/src/main/java/BaseProjectConfig.kt | 6 | ||||
-rw-r--r-- | buildSrc/src/main/java/Dependencies.kt | 94 |
2 files changed, 4 insertions, 96 deletions
diff --git a/buildSrc/src/main/java/BaseProjectConfig.kt b/buildSrc/src/main/java/BaseProjectConfig.kt index 45465c3d..f212bc61 100644 --- a/buildSrc/src/main/java/BaseProjectConfig.kt +++ b/buildSrc/src/main/java/BaseProjectConfig.kt @@ -24,9 +24,9 @@ internal fun Project.configureForRootProject() { // register task for cleaning the build directory in the root project tasks.register("clean", Delete::class.java) { delete(rootProject.buildDir) } tasks.withType<Wrapper> { - gradleVersion = "6.8.3" + gradleVersion = "7.0" distributionType = Wrapper.DistributionType.ALL - distributionSha256Sum = "9af5c8e7e2cd1a3b0f694a4ac262b9f38c75262e74a9e8b5101af302a6beadd7" + distributionSha256Sum = "81003f83b0056d20eedf48cddd4f52a9813163d4ba185bcf8abd34b8eeea4cbd" } configureBinaryCompatibilityValidator() } @@ -40,6 +40,8 @@ internal fun Project.configureForAllProjects() { content { // https://github.com/zhanghai/AndroidFastScroll/issues/35 includeModule("me.zhanghai.android.fastscroll", "library") + + includeModule("org.jetbrains.kotlinx", "kotlinx-html-jvm") } } maven("https://jitpack.io") { diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt deleted file mode 100644 index b20653a0..00000000 --- a/buildSrc/src/main/java/Dependencies.kt +++ /dev/null @@ -1,94 +0,0 @@ -/* - * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. - * SPDX-License-Identifier: GPL-3.0-only - */ - -private const val KOTLIN_VERSION = "1.4.32" - -object Plugins { - const val androidGradlePlugin = "com.android.tools.build:gradle:4.1.3" - const val binaryCompatibilityValidator = "org.jetbrains.kotlinx:binary-compatibility-validator:0.2.4" - const val dokkaPlugin = "org.jetbrains.dokka:dokka-gradle-plugin:1.4.30" - const val downloadTaskPlugin = "de.undercouch:gradle-download-task:4.1.1" - const val kotlinGradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION" - const val ktfmtGradlePlugin = "com.ncorti.ktfmt.gradle:plugin:0.5.0" - const val mavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.13.0" - const val semver4j = "com.vdurmont:semver4j:3.1.0" -} - -object Dependencies { - object Kotlin { - object Coroutines { - - private const val version = "1.4.3" - const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version" - const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version" - } - } - - object AndroidX { - - private const val lifecycleVersion = "2.4.0-alpha01" - - const val activity_ktx = "androidx.activity:activity-ktx:1.3.0-alpha06" - const val annotation = "androidx.annotation:annotation:1.2.0" - const val autofill = "androidx.autofill:autofill:1.2.0-alpha01" - const val appcompat = "androidx.appcompat:appcompat:1.3.0-rc01" - const val biometric_ktx = "androidx.biometric:biometric-ktx:1.2.0-alpha03" - const val constraint_layout = "androidx.constraintlayout:constraintlayout:2.1.0-beta01" - const val core_ktx = "androidx.core:core-ktx:1.6.0-alpha01" - const val documentfile = "androidx.documentfile:documentfile:1.0.1" - const val fragment_ktx = "androidx.fragment:fragment-ktx:1.3.2" - const val lifecycle_common = "androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion" - const val lifecycle_livedata_ktx = "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion" - const val lifecycle_viewmodel_ktx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion" - const val material = "com.google.android.material:material:1.4.0-alpha02" - const val preference = "androidx.preference:preference:1.1.1" - const val recycler_view = "androidx.recyclerview:recyclerview:1.2.0" - const val recycler_view_selection = "androidx.recyclerview:recyclerview-selection:1.1.0" - const val security = "androidx.security:security-crypto:1.1.0-alpha03" - const val swiperefreshlayout = "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01" - } - - object FirstParty { - - const val sublime_fuzzy = "com.github.android-password-store:sublime-fuzzy:1.0.0" - const val zxing_android_embedded = "com.github.android-password-store:zxing-android-embedded:4.1.0-aps" - } - - object ThirdParty { - - const val bouncycastle = "org.bouncycastle:bcprov-jdk15on:1.68" - const val commons_codec = "commons-codec:commons-codec:1.14" - const val eddsa = "net.i2p.crypto:eddsa:0.3.0" - const val fastscroll = "me.zhanghai.android.fastscroll:library:1.1.5" - const val jgit = "org.eclipse.jgit:org.eclipse.jgit:3.7.1.201504261725-r" - const val kotlin_result = "com.michael-bull.kotlin-result:kotlin-result:1.1.11" - const val leakcanary = "com.squareup.leakcanary:leakcanary-android:2.7" - const val modern_android_prefs = "de.maxr1998:modernandroidpreferences:2.0" - const val plumber = "com.squareup.leakcanary:plumber-android:2.7" - const val sshj = "com.hierynomus:sshj:0.31.0" - const val ssh_auth = "com.github.open-keychain.open-keychain:sshauthentication-api:v5.7.1" - const val timber = "com.jakewharton.timber:timber:4.7.1" - const val timberkt = "com.github.ajalt:timberkt:1.5.1" - const val whatthestack = "com.github.haroldadmin:WhatTheStack:0.3.0" - } - - object NonFree { - - const val google_play_auth_api_phone = "com.google.android.gms:play-services-auth-api-phone:17.5.0" - } - - object Testing { - - const val junit = "junit:junit:4.13.2" - const val kotlin_test_junit = "org.jetbrains.kotlin:kotlin-test-junit:$KOTLIN_VERSION" - - object AndroidX { - - private const val version = "1.4.0-alpha05" - const val runner = "androidx.test:runner:$version" - const val rules = "androidx.test:rules:$version" - } - } -} |