Skip to content

Commit

Permalink
apparently // kotlin("multiplatform") version "1.3.50" is causing pro…
Browse files Browse the repository at this point in the history
…blems
  • Loading branch information
hereisderek committed Nov 25, 2019
1 parent f06b5b9 commit 99c9acb
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 27 deletions.
6 changes: 6 additions & 0 deletions .idea/sqlandroid.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 5 additions & 16 deletions base/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jetbrains.kotlin.config.KotlinCompilerVersion
import org.jetbrains.kotlin.kapt3.base.Kapt.kapt


plugins {
Expand Down Expand Up @@ -54,32 +55,20 @@ dependencies {
androidTestImplementation (Libs.androidx_test_ext_junit)
androidTestImplementation (Libs.espresso_core)
}

project.ext.apply {
val mavSiteUrl = "https://github.com/hereisderek/android-util"
set("mavSiteUrl", mavSiteUrl)
set("mavGitUrl", "$mavSiteUrl.git")
set("mavProjectName", "android-util")
set("mavPublishToMavenLocal", true)
set("mavLibraryLicenses", mapOf("Apache-2.0" to "http://www.apache.org/licenses/LICENSE-2.0.txt"))
set("mavLibraryDescription", "A collection of android utilies")
set("mavLibraryDescription", "A collection of android utilities")

}

ext.set("version", android.defaultConfig.versionName)

apply(from = "https://raw.githubusercontent.com/sky-uk/gradle-maven-plugin/master/gradle-mavenizer.gradle")
version = android.defaultConfig.versionName as String

/*
project.ext {
mavSiteUrl = "https://github.com/hereisderek/android-util"
mavGitUrl = mavSiteUrl + '.git'
mavProjectName = 'android-util'
mavPublishToMavenLocal = true
mavLibraryLicenses = ["Apache-2.0":'http://www.apache.org/licenses/LICENSE-2.0.txt']
mavLibraryDescription = "A collection of android utilies"
}
version = android.defaultConfig.versionName
apply(from = "https://raw.githubusercontent.com/sky-uk/gradle-maven-plugin/master/gradle-mavenizer.gradle")

apply from: 'https://raw.githubusercontent.com/sky-uk/gradle-maven-plugin/master/gradle-mavenizer.gradle'
*/
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.github.hereisderek.androidutil.view.list.recyclerview

import android.view.View
import androidx.recyclerview.widget.RecyclerView

/**
*
* User: derekzhu
* Date: 22/11/19 1:29 PM
* Project: android-util
*/


@Suppress("UNCHECKED_CAST")
class ViewHolder<T : View> (view: T) : RecyclerView.ViewHolder(view){
fun <T> getItemView() = itemView as T
}
16 changes: 11 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ plugins {
// id("se.patrikerdes.use-latest-versions") version Versions.se_patrikerdes_use_latest_versions_gradle_plugin
// id("com.github.ben-manes.versions") version Versions.com_github_ben_manes_versions_gradle_plugin
// id("org.jetbrains.gradle.plugin.idea-ext") version "0.4.2"
kotlin("multiplatform") version "1.3.50"
kotlin("plugin.serialization") version "1.3.50"
// kotlin("multiplatform") version "1.3.50"
kotlin("plugin.serialization") version Versions.kotlin_serialization
// kotlin("jvm")
}


Expand All @@ -27,11 +28,14 @@ buildscript {
classpath(Libs.com_android_tools_build_gradle)
// classpath ("com.android.tools.build:gradle:4.0.0-alpha03")
// classpath(kotlin("gradle-plugin", version = "1.3.60"))
// kotlinCompilerClasspath(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar"))))
// kotlinCompilerPluginClasspath(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar"))))
}

repositories {
google()
jcenter()
mavenCentral()
maven (url = "https://dl.bintray.com/kotlin/kotlin-eap")
maven("https://kotlin.bintray.com/kotlinx")
maven("https://jitpack.io")
Expand All @@ -49,9 +53,11 @@ subprojects {
}
}

// tasks.register("clean", Delete::class) {
// delete(rootProject.buildDir)
// }
/*
tasks.register("clean", Delete::class) {
delete(rootProject.buildDir)
}
*/


buildSrcVersions {
Expand Down
1 change: 1 addition & 0 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ plugins {
`kotlin-dsl`
}
repositories {
jcenter()
mavenCentral()
}
12 changes: 6 additions & 6 deletions buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ object Versions {

const val androidx_test_ext_junit: String = "1.1.1"

// const val com_android_tools_build_gradle: String = "3.6.0-beta04"//"4.0.0-alpha04"
const val com_android_tools_build_gradle: String = "4.0.0-alpha04"
const val com_android_tools_build_gradle: String = "3.6.0-beta04"//"4.0.0-alpha04"
// const val com_android_tools_build_gradle: String = "4.0.0-alpha04"

const val junit_junit: String = "4.12"

Expand All @@ -41,13 +41,13 @@ object Versions {

const val kotlin_android_extensions_runtime: String = "1.3.60"

const val kotlin_gradle_plugin: String = "1.3.60"
const val kotlin_gradle_plugin: String = "1.3.50"

const val kotlin_serialization: String = "1.3.60"
const val kotlin_serialization: String = "1.3.50"

const val kotlin_stdlib: String = "1.3.50" // available: "1.3.60"
const val kotlin_stdlib: String = "1.3.60"

const val kotlin_stdlib_jdk7: String = "1.3.60"
const val kotlin_stdlib_jdk7: String = "1.3.50"

const val lint_gradle: String = "27.0.0-alpha03"

Expand Down

0 comments on commit 99c9acb

Please sign in to comment.