null2264/yokai
1
0
Fork 0
mirror of https://github.com/null2264/yokai.git synced 2025-06-21 10:44:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing kotlin extensions + adding jetbrains kotlin

Browse source 
also bumping up to kotlin 1.4.20 and using jsetbrains kotlin for parcelize (needed for mass migration)

With this we can close #684 because we are TRULY finished
This commit is contained in:
Jays2Kings 2021-03-29 23:50:46 -04:00
parent 419e4832ea
commit abea51c805
7 changed files with 8 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
buildSrc/src/main/kotlin/Dependencies.kt
View file

@ -53,7 +53,7 @@ object Versions {
const val injekt = "65b0440"
const val jsoup = "1.13.1"
const val junit = "4.13"
const val kotlin = "1.4.10"
const val kotlin = "1.4.20"
const val kotlinCoroutines = "1.3.9"
const val kotlinSerialization = "1.0.1"
const val kotson = "2.5.0"
@ -98,7 +98,6 @@ object LegacyPluginClassPath {
const val aboutLibraries = "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${Versions.aboutLibraries}"
const val androidGradlePlugin = "com.android.tools.build:gradle:${Versions.androidGradlePlugin}"
const val googleServices = "com.google.gms:google-services:${Versions.googleServices}"
const val kotlinExtensions = "org.jetbrains.kotlin:kotlin-android-extensions:${Versions.kotlin}"
const val kotlinPlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
const val kotlinSerializations = "org.jetbrains.kotlin:kotlin-serialization:${Versions.kotlin}"
const val fireBaseCrashlytics = "com.google.firebase:firebase-crashlytics-gradle:2.3.0"
@ -120,8 +119,10 @@ object Plugins {
const val firebaseCrashlytics = "com.google.firebase.crashlytics"
const val googleServices = "com.google.gms.google-services"
const val kapt = "kapt"
const val kotlinParcelize = "kotlin-parcelize"
const val kotlinAndroid = "android"
const val kotlinExtensions = "android.extensions"
const val jetbrainsKotlin = "org.jetbrains.kotlin.android"
const val kotlinSerialization = "org.jetbrains.kotlin.plugin.serialization"
val gradleVersions = PluginClass("com.github.ben-manes.versions", Versions.gradleVersions)
val ktLint = PluginClass("org.jlleitschuh.gradle.ktlint", Versions.ktlint)
@ -144,7 +145,6 @@ object Configs {
object BuildPluginsVersion {
const val AGP = "com.android.tools.build:gradle:4.1.3"
const val KOTLIN = "1.4.10"
const val ANDROID_EXTENSIONS = "org.jetbrains.kotlin:kotlin-android-extensions:$KOTLIN"
const val KOTLIN_GRADLE = "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN"
const val KOTLINTER = "3.3.0"
const val GOOGLE_SERVICES = "com.google.gms:google-services:4.3.3"