From c5f92aae72beb0cfb7ea1275bb4fc7d96df3746d Mon Sep 17 00:00:00 2001 From: Guilherme Berson Date: Tue, 28 Jan 2020 14:57:39 -0300 Subject: [PATCH] Att gradle os projects and library and remove app_name of library #54 --- .idea/caches/build_file_checksums.ser | Bin 0 -> 592 bytes .idea/codeStyles/Project.xml | 116 ++++++++++++++++++ .idea/kotlinc.xml | 4 +- .idea/misc.xml | 19 ++- .idea/modules.xml | 6 +- app/build.gradle | 22 ++-- build.gradle | 6 +- gradle/wrapper/gradle-wrapper.properties | 4 +- swipe-button/build.gradle | 16 +-- .../java/com/ebanx/swipebtn/SwipeButton.java | 2 - swipe-button/src/main/res/values/strings.xml | 2 - 11 files changed, 162 insertions(+), 35 deletions(-) create mode 100644 .idea/caches/build_file_checksums.ser create mode 100644 .idea/codeStyles/Project.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000000000000000000000000000000000000..7b86d2b9cc06773eb941c32bcaacf939e0596f26 GIT binary patch literal 592 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}Q#7BMhIJFWRF{)3Gp|)zv$<hIq{QE34^AyRZM7cYEf}aRcQfGeGJqkF^Fiz uFy)GD&&_^@O)M`PIA^^1;Z#?`Ac#lxK7l_6O8hfwy|-p`7B(&lssI4 + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index 1c24f9a..3097f31 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -1,7 +1,7 @@ - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 6b6d4d9..069b690 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,21 +5,36 @@ diff --git a/.idea/modules.xml b/.idea/modules.xml index 510195b..29f32f4 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,11 +2,11 @@ + + - - - + diff --git a/app/build.gradle b/app/build.gradle index a74bd67..7dba0a0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,12 +3,12 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 26 - buildToolsVersion "26.0.2" + compileSdkVersion 29 + buildToolsVersion "26.0.3" defaultConfig { applicationId "com.ebanx.swipebutton" - minSdkVersion 19 - targetSdkVersion 26 + minSdkVersion 21 + targetSdkVersion 29 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -33,17 +33,17 @@ android { dependencies { def supportVersion = "26.1.0" - compile fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(include: ['*.jar'], dir: 'libs') + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile "com.android.support:appcompat-v7:$supportVersion" - compile "com.android.support:design:$supportVersion" - testCompile 'junit:junit:4.12' - compile project(':swipe-button') + implementation "com.android.support:appcompat-v7:$supportVersion" + implementation "com.android.support:design:$supportVersion" + testImplementation 'junit:junit:4.12' + implementation project(':swipe-button') // compile 'com.ebanx:swipe-button:0.7.0' - compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } repositories { diff --git a/build.gradle b/build.gradle index 630f0a9..36930d6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.10' + ext.kotlin_version = '1.3.10' repositories { jcenter() google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7' + classpath 'com.android.tools.build:gradle:3.5.3' + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' classpath 'com.btkelly:gnag:1.3.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f56bfe5..81a1c16 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Aug 03 17:13:50 BRT 2017 +#Tue Jan 28 15:32:57 BRST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/swipe-button/build.gradle b/swipe-button/build.gradle index f6b1fdf..c9e789e 100644 --- a/swipe-button/build.gradle +++ b/swipe-button/build.gradle @@ -7,12 +7,12 @@ version = '0.8.3' group = 'com.ebanx' android { - compileSdkVersion 26 - buildToolsVersion "26.0.2" + compileSdkVersion 29 + buildToolsVersion "26.0.3" defaultConfig { - minSdkVersion 16 - targetSdkVersion 26 + minSdkVersion 21 + targetSdkVersion 29 versionCode 1 versionName "1.0" @@ -57,12 +57,12 @@ gnag { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:26.0.0' - testCompile 'junit:junit:4.12' + implementation 'com.android.support:appcompat-v7:26.0.0' + testImplementation 'junit:junit:4.12' } if (project.hasProperty("android")) { // Android libraries diff --git a/swipe-button/src/main/java/com/ebanx/swipebtn/SwipeButton.java b/swipe-button/src/main/java/com/ebanx/swipebtn/SwipeButton.java index d8f45b2..09092bf 100644 --- a/swipe-button/src/main/java/com/ebanx/swipebtn/SwipeButton.java +++ b/swipe-button/src/main/java/com/ebanx/swipebtn/SwipeButton.java @@ -5,7 +5,6 @@ import android.animation.AnimatorSet; import android.animation.ObjectAnimator; import android.animation.ValueAnimator; -import android.annotation.TargetApi; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Color; @@ -74,7 +73,6 @@ public SwipeButton(Context context, AttributeSet attrs, int defStyleAttr) { init(context, attrs, defStyleAttr, -1); } - @TargetApi(21) public SwipeButton(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); diff --git a/swipe-button/src/main/res/values/strings.xml b/swipe-button/src/main/res/values/strings.xml index f6a2dfd..84c9b40 100644 --- a/swipe-button/src/main/res/values/strings.xml +++ b/swipe-button/src/main/res/values/strings.xml @@ -1,5 +1,3 @@ - swipebtn - If you set trail enabled, you must set a value to button_trail_drawable.