Release 3.2.0 (#40)

* Updated Kotlin to 1.3.21, AndroidX AppCompat to 1.0.2 Updated internal AGP to 3.3.2 & Gradle to 5.3.1 * Added kordamp testing plugin
zawadz88 · Mar 29, 2019 · ff9d5cd · ff9d5cd
1 parent e02c549
commit ff9d5cd
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 24 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,14 +9,14 @@ jobs:
 
     environment:
       ANDROID_HOME: /opt/android/sdk
-      ANDROID_BUILD_TOOLS: 28.0.2
+      ANDROID_BUILD_TOOLS: 28.0.3
 
     steps:
       - checkout
 
       # Restore cached dependencies (if any)
       - restore_cache:
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "material-popup-menu/build.gradle" }}-{{ checksum  "sample/build.gradle" }}
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "material-popup-menu/material-popup-menu.gradle" }}-{{ checksum  "sample/sample.gradle" }}
 
       # Prepare the container for the build
       - run:
@@ -48,7 +48,7 @@ jobs:
 
             # Gradle dependencies
             - ~/.gradle
-          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "material-popup-menu/build.gradle" }}-{{ checksum  "sample/build.gradle" }}
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "material-popup-menu/material-popup-menu.gradle" }}-{{ checksum  "sample/sample.gradle" }}
 
       # Collect static analysis reports as build artifacts
       - store_artifacts:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.2.0]
+### Changed
+- Updated Kotlin to 1.3.21, AndroidX AppCompat to 1.0.2
+- Updated internal AGP to 3.3.2 & Gradle to 5.3.1
+
 ## [3.1.0]
 ### Added
 - A listener to get notified when popup menus get dismissed
@@ -66,6 +71,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 Initial release of the library.
 
+[3.2.0]: https://github.com/zawadz88/MaterialPopupMenu/compare/3.1.0...3.2.0
 [3.1.0]: https://github.com/zawadz88/MaterialPopupMenu/compare/3.0.0...3.1.0
 [3.0.0]: https://github.com/zawadz88/MaterialPopupMenu/compare/2.2.0...3.0.0
 [2.2.0]: https://github.com/zawadz88/MaterialPopupMenu/compare/2.1.0...2.2.0

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ This library allows to create simple popup menus programmatically with a nice [t
 
 ## Download (from JCenter)
 ```groovy
-implementation 'com.github.zawadz88.materialpopupmenu:material-popup-menu:3.1.0'
+implementation 'com.github.zawadz88.materialpopupmenu:material-popup-menu:3.2.0'
 ```
 
 ## Getting started

diff --git a/build.gradle b/build.gradle
@@ -1,25 +1,28 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
-    ext.KOTLIN_VERSION = '1.2.71'
-    ext.ANDROID_GRADLE_PLUGIN_VERSION = '3.2.1'
-    ext.DOKKA_VERSION = '0.9.17'
-    ext.BINTRAY_VERSION = '1.7.3'
+    ext.KOTLIN_VERSION = '1.3.21'
+    ext.ANDROID_GRADLE_PLUGIN_VERSION = '3.3.2'
+    ext.DOKKA_VERSION = '0.9.18'
+    ext.BINTRAY_VERSION = '1.8.4'
+    ext.KORDAMP_VERSION = '0.15.1'
     repositories {
         google()
         jcenter()
         maven {
             url 'https://dl.bintray.com/kotlin/kotlin-eap'
         }
+        gradlePluginPortal()
     }
     dependencies {
         classpath "com.android.tools.build:gradle:$ANDROID_GRADLE_PLUGIN_VERSION"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
         classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:$DOKKA_VERSION"
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$BINTRAY_VERSION"
+        classpath "org.kordamp.gradle:testing-gradle-plugin:$KORDAMP_VERSION"
     }
 }
 
+apply plugin: 'org.kordamp.gradle.testing'
+
 allprojects {
     repositories {
         google()
@@ -34,19 +37,16 @@ configure(allprojects) {
         ANDROID_COMPILE_SDK_VERSION         = 28
         ANDROID_BUILD_TOOLS_VERSION         = '28.0.3'
 
-        ANDROIDX_CORE_VERSION               = '1.0.0'
+        ANDROIDX_CORE_VERSION               = '1.0.1'
         ANDROIDX_ANNOTATION_VERSION         = '1.0.0'
-        ANDROIDX_APPCOMPAT_VERSION          = '1.0.0'
+        ANDROIDX_APPCOMPAT_VERSION          = '1.0.2'
         ANDROIDX_RECYCLERVIEW_VERSION       = '1.0.0'
         ANDROIDX_CONSTRAINTLAYOUT_VERSION   = '1.1.3'
-        BUTTERKNIFE_VERSION                 = '9.0.0-rc1'
+        BUTTERKNIFE_VERSION                 = '10.1.0'
 
         JUNIT_VERSION                       = '4.12'
         HAMCREST_VERSION                    = '1.3'
         MOCKITO_KOTLIN_VERSION              = '1.5.0'
     }
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
diff --git a/gradle/tools/bintrayv1.gradle b/gradle/tools/bintrayv1.gradle
@@ -25,4 +25,4 @@ bintray {
             desc = libraryDescription
         }
     }
-}
+}
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.3.1-all.zip
diff --git a/material-popup-menu/build.gradle → ...ial-popup-menu/material-popup-menu.gradle b/material-popup-menu/build.gradle → ...ial-popup-menu/material-popup-menu.gradle
@@ -22,7 +22,6 @@ android {
 }
 
 dependencies {
-
     api "androidx.appcompat:appcompat:$ANDROIDX_APPCOMPAT_VERSION"
     api "androidx.recyclerview:recyclerview:$ANDROIDX_RECYCLERVIEW_VERSION"
 
@@ -75,18 +74,17 @@ ext {
     siteUrl = 'https://github.com/zawadz88/MaterialPopupMenu'
     gitUrl = 'https://github.com/zawadz88/MaterialPopupMenu.git'
 
-    libraryVersion = '3.1.0'
+    libraryVersion = '3.2.0'
 
     developerId = 'zawadz88'
     developerName = 'Piotr Zawadzki'
-    developerEmail = '[email protected]'
+    developerEmail = '[email protected]'
 
     licenseName = 'The Apache Software License, Version 2.0'
     licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
     allLicenses = ["Apache-2.0"]
 }
 
-
 tasks.withType(Javadoc) {
     excludes = ['**/*.kt']
 }
@@ -116,7 +114,7 @@ publishing {
 
             artifact sourcesJar
             artifact javadocJar
-            artifact("$buildDir/outputs/aar/material-popup-menu-release.aar")
+            artifact("$buildDir/outputs/aar/material-popup-menu-${libraryVersion}.aar")
 
             groupId publishedGroupId
             artifactId artifact

diff --git a/sample/build.gradle → sample/sample.gradle b/sample/build.gradle → sample/sample.gradle
@@ -18,6 +18,13 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
+
+    compileOptions {
+        incremental false
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
+    }
+
     buildTypes {
         release {
             minifyEnabled false

diff --git a/settings.gradle b/settings.gradle
@@ -1 +1,15 @@
-include ':material-popup-menu', ':sample'
+buildscript {
+    repositories {
+        gradlePluginPortal()
+        mavenLocal()
+    }
+    dependencies {
+        classpath 'org.kordamp.gradle:settings-gradle-plugin:0.15.1'
+    }
+}
+
+apply plugin: 'org.kordamp.gradle.settings'
+
+projects {
+    layout = 'standard'
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,4 +25,4 @@ bintray { @@
                 desc = libraryDescription
             }
         }
-    }
+    }