Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating versions to latest #54

Merged
merged 1 commit into from
Oct 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions buildSrc/src/main/kotlin/CustomTasks.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import org.gradle.api.Project

fun Project.customTasks() {
tasks.register("hello") {
group = "custom"
description = "Hello World task - useful to solve build problems"

doLast {
println("Hello :)")
}
}
}
141 changes: 40 additions & 101 deletions buildSrc/src/main/kotlin/Libs.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,110 +7,49 @@ import kotlin.String
* `$ ./gradlew buildSrcVersions`
*/
object Libs {
/**
* http://developer.android.com/tools/extras/support-library.html
*/
const val appcompat: String = "androidx.appcompat:appcompat:" + Versions.appcompat

/**
* http://developer.android.com/tools/extras/support-library.html
*/
const val browser: String = "androidx.browser:browser:" + Versions.browser

/**
* http://tools.android.com
*/
const val constraintlayout: String = "androidx.constraintlayout:constraintlayout:" +
Versions.constraintlayout

const val databinding_adapters: String = "androidx.databinding:databinding-adapters:" +
Versions.androidx_databinding

/**
* https://developer.android.com/studio
*/
const val databinding_common: String = "androidx.databinding:databinding-common:" +
Versions.androidx_databinding

/**
* https://developer.android.com/studio
*/
const val databinding_compiler: String = "androidx.databinding:databinding-compiler:" +
Versions.androidx_databinding

const val databinding_runtime: String = "androidx.databinding:databinding-runtime:" +
Versions.androidx_databinding

/**
* https://developer.android.com/topic/libraries/architecture/index.html
*/
const val lifecycle_extensions: String = "androidx.lifecycle:lifecycle-extensions:" +
Versions.androidx_lifecycle

/**
* https://developer.android.com/topic/libraries/architecture/index.html
*/
const val lifecycle_viewmodel: String = "androidx.lifecycle:lifecycle-viewmodel:" +
Versions.androidx_lifecycle

/**
* https://developer.android.com/testing
*/
const val espresso_core: String = "androidx.test.espresso:espresso-core:" +
Versions.espresso_core

/**
* https://developer.android.com/testing
*/
const val androidx_test_runner: String = "androidx.test:runner:" + Versions.androidx_test_runner

/**
* https://developer.android.com/studio
*/
const val aapt2: String = "com.android.tools.build:aapt2:" + Versions.aapt2

/**
* https://developer.android.com/studio
*/
const val com_android_tools_build_gradle: String = "com.android.tools.build:gradle:" +
Versions.com_android_tools_build_gradle

/**
* https://developer.android.com/studio
*/
const val lint_gradle: String = "com.android.tools.lint:lint-gradle:" + Versions.lint_gradle
const val databinding_adapters: String = "androidx.databinding:databinding-adapters:3.5.1"

const val de_fayard_buildsrcversions_gradle_plugin: String =
"de.fayard.buildSrcVersions:de.fayard.buildSrcVersions.gradle.plugin:" +
Versions.de_fayard_buildsrcversions_gradle_plugin
const val databinding_common: String = "androidx.databinding:databinding-common:3.5.1"

/**
* http://junit.org
*/
const val junit: String = "junit:junit:" + Versions.junit
const val databinding_compiler: String = "androidx.databinding:databinding-compiler:3.5.1"

/**
* https://kotlinlang.org/
*/
const val kotlin_android_extensions_runtime: String =
"org.jetbrains.kotlin:kotlin-android-extensions-runtime:" +
Versions.org_jetbrains_kotlin
const val databinding_runtime: String = "androidx.databinding:databinding-runtime:3.5.1"

/**
* https://kotlinlang.org/
*/
const val kotlin_android_extensions: String =
"org.jetbrains.kotlin:kotlin-android-extensions:" + Versions.org_jetbrains_kotlin

/**
* https://kotlinlang.org/
*/
const val kotlin_gradle_plugin: String = "org.jetbrains.kotlin:kotlin-gradle-plugin:" +
Versions.org_jetbrains_kotlin

/**
* https://kotlinlang.org/
*/
const val kotlin_stdlib_jdk8: String = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:" +
Versions.org_jetbrains_kotlin
"org.jetbrains.kotlin:kotlin-android-extensions:1.3.50"

const val kotlin_android_extensions_runtime: String =
"org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.3.50"

const val kotlin_gradle_plugin: String = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.50"

const val kotlin_stdlib_jdk8: String = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50"

const val lifecycle_extensions: String = "androidx.lifecycle:lifecycle-extensions:2.1.0"

const val lifecycle_viewmodel: String = "androidx.lifecycle:lifecycle-viewmodel:2.1.0"

const val com_android_tools_build_gradle: String = "com.android.tools.build:gradle:3.5.1"

const val androidx_test_runner: String = "androidx.test:runner:1.2.0"

const val io_gitlab_arturbosch_detekt_gradle_plugin: String =
"io.gitlab.arturbosch.detekt:io.gitlab.arturbosch.detekt.gradle.plugin:1.1.1"

const val de_fayard_buildsrcversions_gradle_plugin: String =
"de.fayard.buildSrcVersions:de.fayard.buildSrcVersions.gradle.plugin:0.7.0"

const val constraintlayout: String = "androidx.constraintlayout:constraintlayout:1.1.3"

const val espresso_core: String = "androidx.test.espresso:espresso-core:3.2.0"

const val lint_gradle: String = "com.android.tools.lint:lint-gradle:26.5.1"

const val appcompat: String = "androidx.appcompat:appcompat:1.1.0"

const val browser: String = "androidx.browser:browser:1.0.0"

const val aapt2: String = "com.android.tools.build:aapt2:3.5.1-5435860"

const val junit: String = "junit:junit:4.12"
}
10 changes: 5 additions & 5 deletions buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,22 @@ object Versions {

const val lint_gradle: String = "26.5.0"

const val de_fayard_buildsrcversions_gradle_plugin: String = "0.4.2"
const val de_fayard_buildsrcversions_gradle_plugin: String = "0.7.0"

const val junit: String = "4.12"

const val org_jetbrains_kotlin: String = "1.3.41" // available: "1.3.50"
const val org_jetbrains_kotlin: String = "1.3.50"

const val io_gitlab_arturbosch_detekt: String = "1.0.1"
const val io_gitlab_arturbosch_detekt: String = "1.1.1"

/**
*
* See issue 19: How to update Gradle itself?
* https://github.com/jmfayard/buildSrcVersions/issues/19
*/
const val gradleLatestVersion: String = "5.6.1"
const val gradleLatestVersion: String = "5.6.2"

const val gradleCurrentVersion: String = "5.5"
const val gradleCurrentVersion: String = "5.6.2"
}

/**
Expand Down
22 changes: 20 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ android.minSdkVersion=18
android.applicationId=to.dev.dev_android
android.versionCode=4
android.versionName=1.2
version.org.jetbrains.kotlin=1.3.50

# Keep in sync with buildSrc/build.gradle.kts
version.com.android.tools.build..gradle=3.5.0


# Project-wide Gradle settings.
Expand All @@ -30,3 +28,23 @@ kotlin.code.style=official
android.useAndroidX=true
android.enableJetifier=true
studio.projectview=true
# Dependencies and Plugin versions with their available updates
# Generated by $ ./gradlew refreshVersions
# You can edit the rest of the file, it will be kept intact
# See https://github.com/jmfayard/buildSrcVersions/issues/77
plugin.com.github.ben-manes.versions=0.25.0
plugin.io.gitlab.arturbosch.detekt=1.1.1
plugin.de.fayard.buildSrcVersions=0.7.0
version.androidx.databinding=3.5.1
version.org.jetbrains.kotlin=1.3.50
version.androidx.lifecycle=2.1.0
version.com.android.tools.build..gradle=3.5.1
version.androidx.test..runner=1.2.0
version.gradleLatestVersion=5.6.2
version.constraintlayout=1.1.3
version.espresso-core=3.2.0
version.lint-gradle=26.5.1
version.appcompat=1.1.0
version.browser=1.0.0
version.aapt2=3.5.1-5435860
version.junit=4.12
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists