From d5b5e6fc65ba0e8ab15ae8838b8f2759c11e6fd5 Mon Sep 17 00:00:00 2001 From: Tsubasa Nakayama Date: Fri, 26 Jul 2019 22:02:18 +0900 Subject: [PATCH] update dep --- CHANGELOG.md | 4 +++ build.gradle | 9 +++---- chatmessageview/build.gradle | 31 ------------------------ gradle/wrapper/gradle-wrapper.properties | 4 +-- 4 files changed, 10 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06a01b0..64b28a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG +Ver 2.1.0 +- dependency update +- remove android-maven-gradle-plugin + Ver 2.0.1 - fix scritps diff --git a/build.gradle b/build.gradle index 50e4c65..3676736 100644 --- a/build.gradle +++ b/build.gradle @@ -7,10 +7,9 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.android.tools.build:gradle:3.4.2' classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' - classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' - classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.21' + classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.41' } } @@ -37,13 +36,13 @@ def getLibVersion() { } ext { - kotlinVersion = '1.3.21' + kotlinVersion = '1.3.41' compileSdkVersion = 28 minSdkVersion = 15 targetSdkVersion = 28 versionCode = 1 versionName = getLibVersion() - androidXCoreVersion = '1.0.1' + androidXCoreVersion = '1.0.2' androidXAppcompatVersion = '1.0.2' circleimageviewVersion = '3.0.0' junitVersion = '4.12' diff --git a/chatmessageview/build.gradle b/chatmessageview/build.gradle index fe9440b..daf712c 100644 --- a/chatmessageview/build.gradle +++ b/chatmessageview/build.gradle @@ -1,7 +1,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' -apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' apply plugin: "maven" @@ -60,36 +59,6 @@ bintray { } } -install { - repositories.mavenInstaller { - pom { - project { - packaging 'aar' - name = project.name - url = siteUrl - licenses { - license { - name 'Apache-2.0' - url 'https://www.apache.org/licenses/LICENSE-2.0' - } - } - developers { - developer { - id 'bassaer' - name 'Tsubasa Nakayama' - email 'app.nakayama@gmail.com' - } - } - scm { - connection = gitUrl - developerConnection = gitUrl - url siteUrl - } - } - } - } -} - dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation "androidx.core:core:$androidXCoreVersion" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ef1d032..13207cc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Jul 08 02:09:19 JST 2018 +#Fri Jul 26 21:18:21 JST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip