Skip to content

Commit d721a75

Browse files
committed
Fix build problems
1 parent b2ad324 commit d721a75

File tree

5 files changed

+25
-51
lines changed

5 files changed

+25
-51
lines changed

MaskedEditText/build.gradle

Lines changed: 7 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
1-
plugins {
2-
id "com.jfrog.bintray" version "1.7.3"
3-
}
4-
51
apply plugin: 'com.android.library'
62
apply plugin: 'com.github.dcendents.android-maven'
73

8-
String projectVersion = "1.0.5"
4+
String projectVersion = "1.0.9"
95
String projectGroup = "ru.egslava"
106

117
version = projectVersion
128
group = projectGroup
139

1410
android {
15-
compileSdkVersion 25
16-
buildToolsVersion '25.0.2'
11+
compileSdkVersion 28
12+
buildToolsVersion '25.0.3'
1713

1814

1915
defaultConfig {
20-
minSdkVersion 9
21-
targetSdkVersion 25
16+
minSdkVersion 21
17+
targetSdkVersion 28
2218
versionCode 1
2319
versionName projectVersion
2420
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -31,15 +27,14 @@ dependencies {
3127
})
3228

3329
compile fileTree(dir: 'libs', include: ['*.jar'])
34-
compile 'com.android.support:appcompat-v7:25.2.0'
30+
compile 'com.android.support:appcompat-v7:28.0.0'
3531

3632
testCompile 'junit:junit:4.12'
3733
}
3834

3935

4036
// bintray deploy ....
4137
String projectName = "edittext-mask"
42-
String projectDescription = GFileUtils.readFile(new File("README.md"))
4338
String webUrl = "https://github.com/egslava/edittext-mask"
4439
String gitUrl = "https://github.com/egslava/edittext-mask.git"
4540

@@ -49,9 +44,8 @@ install {
4944
pom {
5045
project {
5146
packaging 'aar'
52-
47+
5348
name projectName
54-
description projectDescription
5549
url webUrl
5650

5751
inceptionYear '2017' // HARDCODED
@@ -104,26 +98,3 @@ artifacts {
10498
archives javadocJar
10599
archives sourcesJar
106100
}
107-
108-
bintray {
109-
user = bintrayUser
110-
key = bintrayApikey
111-
112-
configurations = ['archives']
113-
pkg {
114-
repo = "maven"
115-
name = projectName
116-
userOrg = user
117-
// projectUrl = webUrl
118-
vcsUrl = gitUrl
119-
licenses = ["MIT"]
120-
group = projectGroup
121-
publish = true
122-
123-
version {
124-
name = projectVersion
125-
// desc = projectDescription
126-
vcsTag = projectVersion
127-
}
128-
}
129-
}

app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion '25.0.2'
4+
compileSdkVersion 28
5+
buildToolsVersion '25.0.3'
66

77
defaultConfig {
88
applicationId "ru.egslava.edittextphonenumber"
9-
minSdkVersion 9
10-
targetSdkVersion 25
9+
minSdkVersion 21
10+
targetSdkVersion 28
1111
versionCode 1
1212
versionName "1.0.0"
1313
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
@@ -22,7 +22,7 @@ android {
2222

2323
dependencies {
2424
compile fileTree(dir: 'libs', include: ['*.jar'])
25-
compile 'com.android.support:appcompat-v7:25.2.0'
25+
compile 'com.android.support:appcompat-v7:28.0.0'
2626
compile project(':MaskedEditText')
2727
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2', {
2828
exclude group: 'com.android.support', module: 'support-annotations'

app/src/main/java/ru/egslava/edittextphonenumber/MainActivity.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
package ru.egslava.edittextphonenumber;
22

3-
import android.support.v7.app.ActionBarActivity;
43
import android.os.Bundle;
5-
import android.text.InputFilter;
6-
import android.text.Spanned;
4+
import android.support.v7.app.AppCompatActivity;
75
import android.view.Menu;
86
import android.view.MenuItem;
9-
import android.view.View;
10-
import android.widget.EditText;
11-
127

138
import br.com.sapereaude.maskedEditText.MaskedEditText;
149

15-
public class MainActivity extends ActionBarActivity {
10+
public class MainActivity extends AppCompatActivity {
1611

1712
@Override
1813
protected void onCreate(Bundle savedInstanceState) {

build.gradle

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
buildscript {
44
repositories {
55
jcenter()
6+
maven {
7+
url 'https://maven.google.com/'
8+
name 'Google'
9+
}
610
}
711
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.3'
12+
classpath 'com.android.tools.build:gradle:3.5.3'
913
// classpath 'com.github.dcendents:android-maven-plugin:1.2'
1014
// https://mvnrepository.com/artifact/com.github.dcendents/android-maven-gradle-plugin
1115
classpath group: 'com.github.dcendents', name: 'android-maven-gradle-plugin', version: '1.5'
@@ -17,5 +21,9 @@ buildscript {
1721
allprojects {
1822
repositories {
1923
jcenter()
24+
maven {
25+
url 'https://maven.google.com/'
26+
name 'Google'
27+
}
2028
}
2129
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Wed Jan 08 10:22:06 CET 2020
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

0 commit comments

Comments
 (0)