From 3b424fedd079637ffa2723ab55902aa186ec6229 Mon Sep 17 00:00:00 2001 From: Dima Date: Mon, 8 Apr 2019 18:09:22 +0300 Subject: [PATCH] changes before release --- app/build.gradle | 5 +++++ .../ExampleInstrumentedTest.kt | 2 +- app/src/main/AndroidManifest.xml | 4 ++-- .../MainActivity.kt | 2 +- .../ExampleUnitTest.kt | 2 +- build.gradle | 2 +- password_view_lib/build.gradle | 21 +++++++++++++++++-- 7 files changed, 30 insertions(+), 8 deletions(-) rename app/src/androidTest/java/pc/dd/{passwordedittext => example}/ExampleInstrumentedTest.kt (95%) rename app/src/main/java/pc/dd/{passwordedittext => example}/MainActivity.kt (93%) rename app/src/test/java/pc/dd/{passwordedittext => example}/ExampleUnitTest.kt (91%) diff --git a/app/build.gradle b/app/build.gradle index 6ce153c..9a277ac 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,6 +21,11 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + + lintOptions { + abortOnError false + } + } dependencies { diff --git a/app/src/androidTest/java/pc/dd/passwordedittext/ExampleInstrumentedTest.kt b/app/src/androidTest/java/pc/dd/example/ExampleInstrumentedTest.kt similarity index 95% rename from app/src/androidTest/java/pc/dd/passwordedittext/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/pc/dd/example/ExampleInstrumentedTest.kt index aac76b8..5c3be18 100644 --- a/app/src/androidTest/java/pc/dd/passwordedittext/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/pc/dd/example/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package pc.dd.passwordedittext +package pc.dd.example import android.support.test.InstrumentationRegistry import android.support.test.runner.AndroidJUnit4 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 6afc9f7..f4ae357 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="pc.dd.example"> - + diff --git a/app/src/main/java/pc/dd/passwordedittext/MainActivity.kt b/app/src/main/java/pc/dd/example/MainActivity.kt similarity index 93% rename from app/src/main/java/pc/dd/passwordedittext/MainActivity.kt rename to app/src/main/java/pc/dd/example/MainActivity.kt index 568ca13..1ef3d7e 100644 --- a/app/src/main/java/pc/dd/passwordedittext/MainActivity.kt +++ b/app/src/main/java/pc/dd/example/MainActivity.kt @@ -1,4 +1,4 @@ -package pc.dd.passwordedittext +package pc.dd.example import android.support.v7.app.AppCompatActivity import android.os.Bundle diff --git a/app/src/test/java/pc/dd/passwordedittext/ExampleUnitTest.kt b/app/src/test/java/pc/dd/example/ExampleUnitTest.kt similarity index 91% rename from app/src/test/java/pc/dd/passwordedittext/ExampleUnitTest.kt rename to app/src/test/java/pc/dd/example/ExampleUnitTest.kt index 39abe17..a42b1e5 100644 --- a/app/src/test/java/pc/dd/passwordedittext/ExampleUnitTest.kt +++ b/app/src/test/java/pc/dd/example/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package pc.dd.passwordedittext +package pc.dd.example import org.junit.Test diff --git a/build.gradle b/build.gradle index a6b2983..b25191e 100644 --- a/build.gradle +++ b/build.gradle @@ -10,6 +10,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.3.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'com.novoda:bintray-release:0.9' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -19,7 +20,6 @@ allprojects { repositories { google() jcenter() - } } diff --git a/password_view_lib/build.gradle b/password_view_lib/build.gradle index 04d2e24..52e6473 100644 --- a/password_view_lib/build.gradle +++ b/password_view_lib/build.gradle @@ -1,15 +1,32 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android' +apply plugin: 'com.novoda.bintray-release' + +publish { + + def groupProjectID = 'pc.dd.password_view' + def artifactProjectID = 'PasswordEditText' + def publishVersionID = '1.1.2' + + userOrg = 'followthemoney1' + repoName = 'PasswordEditText' + groupId = groupProjectID + artifactId = artifactProjectID + publishVersion = publishVersionID + desc = 'concept library for checking the password for correct input' + website = 'https://github.com/followthemoney1/PasswordEditText.git' +} + android { compileSdkVersion 28 defaultConfig { - minSdkVersion 15 + minSdkVersion 21 targetSdkVersion 28 versionCode 1 - versionName "1.0" + versionName "1.1.2" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"