Skip to content

Commit a58119a

Browse files
author
dimkinware
committed
- compileSdkVersion=29, minSdkVersion=19, targetSdkVersion=29, gradle plugin=3.5.3
- move to androidX
1 parent 886aeee commit a58119a

5 files changed

Lines changed: 122 additions & 116 deletions

File tree

‎app/build.gradle‎

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

33
android {
4-
compileSdkVersion 24
5-
buildToolsVersion "24.0.0"
4+
compileSdkVersion 29
65

76
defaultConfig {
87
applicationId "io.gresse.hugo.vumeter"
9-
minSdkVersion 9
10-
targetSdkVersion 24
11-
versionCode 3
12-
versionName "1.0.11"
8+
minSdkVersion 19
9+
targetSdkVersion 29
10+
versionCode 4
11+
versionName "1.1.0"
1312
archivesBaseName = "VuMeterLibrary-demo-" + versionName
1413
}
1514
buildTypes {
@@ -21,7 +20,7 @@ android {
2120
}
2221

2322
dependencies {
24-
compile fileTree(dir: 'libs', include: ['*.jar'])
25-
compile 'com.android.support:appcompat-v7:24.0.0'
26-
compile project(':vumeterlibrary')
23+
implementation fileTree(dir: 'libs', include: ['*.jar'])
24+
implementation 'androidx.appcompat:appcompat:1.1.0'
25+
implementation project(':vumeterlibrary')
2726
}

‎build.gradle‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
buildscript {
44
repositories {
55
jcenter()
6+
google()
67
}
78
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.1'
9+
classpath 'com.android.tools.build:gradle:3.5.3'
910
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.5'
1011
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
1112

@@ -17,5 +18,6 @@ buildscript {
1718
allprojects {
1819
repositories {
1920
jcenter()
21+
google()
2022
}
2123
}

‎gradle.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@
1515
# When configured, Gradle will run in incubating parallel mode.
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18-
# org.gradle.parallel=true
18+
# org.gradle.parallel=true
19+
android.enableJetifier=true
20+
android.useAndroidX=true

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Nov 14 13:01:37 CET 2016
1+
#Tue Feb 11 10:58:35 MSK 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-2.14.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

‎vumeterlibrary/build.gradle‎

Lines changed: 106 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
1-
import java.util.regex.Pattern
1+
//import java.util.regex.Pattern
22

33
apply plugin: 'com.android.library'
44
apply plugin: 'com.jfrog.bintray'
55
apply plugin: 'com.github.dcendents.android-maven'
66

77
android {
8-
compileSdkVersion 24
9-
buildToolsVersion "24.0.3"
8+
compileSdkVersion 29
109

1110
resourcePrefix "vumeter_"
1211

1312
defaultConfig {
14-
minSdkVersion 9
15-
versionCode 17
16-
versionName "1.0.17"
17-
targetSdkVersion 24
13+
minSdkVersion 19
14+
targetSdkVersion 29
15+
versionCode 18
16+
versionName "1.1.0"
1817
}
1918
buildTypes {
2019
release {
@@ -25,104 +24,108 @@ android {
2524
}
2625

2726
dependencies {
28-
compile fileTree(dir: 'libs', include: ['*.jar'])
29-
compile 'com.android.support:appcompat-v7:24.2.1'
27+
implementation fileTree(dir: 'libs', include: ['*.jar'])
28+
// implementation 'androidx.appcompat:appcompat:1.0.0'
3029
}
3130

3231
///////////////////////////////////////////
3332
// Bintray and jCenter upload configuration
3433

35-
Properties properties = new Properties()
36-
properties.load(project.rootProject.file('local.properties').newDataInputStream())
37-
38-
version = android.defaultConfig.versionName
39-
group = 'io.gresse.hugo.vumeterlibrary'
40-
41-
uploadArchives {
42-
repositories {
43-
mavenDeployer {
44-
45-
pom.project {
46-
47-
packaging 'aar'
48-
url 'https://github.com/HugoGresse/AndroidVuMeter'
49-
50-
developers {
51-
developer {
52-
id 'hugogresse'
53-
name 'Hugo Gresse'
54-
email 'hugo.gresse@gmail.com'
55-
}
56-
}
57-
}
58-
}
59-
}
60-
}
61-
62-
bintray {
63-
user = properties.getProperty("bintray.user")
64-
key = properties.getProperty("bintray.apikey")
65-
66-
configurations = ['archives']
67-
pkg {
68-
repo = 'AndroidVuMeter'
69-
name = 'AndroidVuMeter'
70-
licenses = ['Apache-2.0']
71-
vcsUrl = 'git@github.com:HugoGresse/AndroidVuMeter.git'
72-
websiteUrl = 'https://github.com/HugoGresse/AndroidVuMeter'
73-
publish = true
74-
//noinspection GroovyAssignabilityCheck
75-
version {
76-
name = android.defaultConfig.versionName
77-
}
78-
}
79-
}
80-
81-
task javadoc(type: Javadoc) {
82-
source = android.sourceSets.main.java.srcDirs
83-
failOnError false
84-
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
85-
}
86-
87-
task javadocJar(type: Jar, dependsOn: javadoc) {
88-
classifier = 'javadoc'
89-
from javadoc.destinationDir
90-
}
91-
artifacts {
92-
archives javadocJar
93-
}
94-
95-
96-
////////////////////////////////
97-
// Auto update minor version number
98-
99-
task incrementVersionCode << {
100-
println("Incrementing Version Code...")
101-
def manifestFile = file("build.gradle")
102-
def patternVersionCode = Pattern.compile("versionCode (\\d+)")
103-
def manifestText = manifestFile.getText()
104-
def matcherVersionCode = patternVersionCode.matcher(manifestText)
105-
matcherVersionCode.find()
106-
def mVersionCode = Integer.parseInt(matcherVersionCode.group(1))
107-
def mNextVersionCode = mVersionCode + 1
108-
def manifestContent = matcherVersionCode.replaceAll("versionCode " + mNextVersionCode)
109-
println("> Set versionCode(" + mVersionCode + ") to " + mNextVersionCode);
110-
manifestFile.write(manifestContent)
111-
}
112-
113-
task incrementVersionName << {
114-
println("Incrementing Version Name...")
115-
def manifestFile = file("build.gradle")
116-
def patternVersionNumber = Pattern.compile("versionName \"(\\d+)\\.(\\d+)\\.(\\d+)\"")
117-
def manifestText = manifestFile.getText()
118-
def matcherVersionNumber = patternVersionNumber.matcher(manifestText)
119-
matcherVersionNumber.find()
120-
def majorVersion = Integer.parseInt(matcherVersionNumber.group(1))
121-
def minorVersion = Integer.parseInt(matcherVersionNumber.group(2))
122-
def pointVersion = Integer.parseInt(matcherVersionNumber.group(3))
123-
def mVersionName = majorVersion + "." + minorVersion + "." + pointVersion
124-
def mNextVersionName = majorVersion + "." + minorVersion + "." + (pointVersion + 1)
125-
def manifestContent = matcherVersionNumber.replaceAll("versionName \"" + mNextVersionName + "\"")
126-
println("> Set versionName(" + mVersionName + ") to " + mNextVersionName);
127-
manifestFile.write(manifestContent)
128-
}
34+
//Properties properties = new Properties()
35+
//properties.load(project.rootProject.file('local.properties').newDataInputStream())
36+
//
37+
//version = android.defaultConfig.versionName
38+
//group = 'io.gresse.hugo.vumeterlibrary'
39+
//
40+
//uploadArchives {
41+
// repositories {
42+
// mavenDeployer {
43+
//
44+
// pom.project {
45+
//
46+
// packaging 'aar'
47+
// url 'https://github.com/HugoGresse/AndroidVuMeter'
48+
//
49+
// developers {
50+
// developer {
51+
// id 'hugogresse'
52+
// name 'Hugo Gresse'
53+
// email 'hugo.gresse@gmail.com'
54+
// }
55+
// }
56+
// }
57+
// }
58+
// }
59+
//}
60+
//
61+
//bintray {
62+
// user = properties.getProperty("bintray.user")
63+
// key = properties.getProperty("bintray.apikey")
64+
//
65+
// configurations = ['archives']
66+
// pkg {
67+
// repo = 'AndroidVuMeter'
68+
// name = 'AndroidVuMeter'
69+
// licenses = ['Apache-2.0']
70+
// vcsUrl = 'git@github.com:HugoGresse/AndroidVuMeter.git'
71+
// websiteUrl = 'https://github.com/HugoGresse/AndroidVuMeter'
72+
// publish = true
73+
// //noinspection GroovyAssignabilityCheck
74+
// version {
75+
// name = android.defaultConfig.versionName
76+
// }
77+
// }
78+
//}
79+
//
80+
//task javadoc(type: Javadoc) {
81+
// source = android.sourceSets.main.java.srcDirs
82+
// failOnError false
83+
// classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
84+
//}
85+
//
86+
//task javadocJar(type: Jar, dependsOn: javadoc) {
87+
// classifier = 'javadoc'
88+
// from javadoc.destinationDir
89+
//}
90+
//artifacts {
91+
// archives javadocJar
92+
//}
93+
//
94+
//
95+
//////////////////////////////////
96+
//// Auto update minor version number
97+
//
98+
//task incrementVersionCode {
99+
// doLast {
100+
// println("Incrementing Version Code...")
101+
// def manifestFile = file("build.gradle")
102+
// def patternVersionCode = Pattern.compile("versionCode (\\d+)")
103+
// def manifestText = manifestFile.getText()
104+
// def matcherVersionCode = patternVersionCode.matcher(manifestText)
105+
// matcherVersionCode.find()
106+
// def mVersionCode = Integer.parseInt(matcherVersionCode.group(1))
107+
// def mNextVersionCode = mVersionCode + 1
108+
// def manifestContent = matcherVersionCode.replaceAll("versionCode " + mNextVersionCode)
109+
// println("> Set versionCode(" + mVersionCode + ") to " + mNextVersionCode);
110+
// manifestFile.write(manifestContent)
111+
// }
112+
//}
113+
//
114+
//task incrementVersionName {
115+
// doLast {
116+
// println("Incrementing Version Name...")
117+
// def manifestFile = file("build.gradle")
118+
// def patternVersionNumber = Pattern.compile("versionName \"(\\d+)\\.(\\d+)\\.(\\d+)\"")
119+
// def manifestText = manifestFile.getText()
120+
// def matcherVersionNumber = patternVersionNumber.matcher(manifestText)
121+
// matcherVersionNumber.find()
122+
// def majorVersion = Integer.parseInt(matcherVersionNumber.group(1))
123+
// def minorVersion = Integer.parseInt(matcherVersionNumber.group(2))
124+
// def pointVersion = Integer.parseInt(matcherVersionNumber.group(3))
125+
// def mVersionName = majorVersion + "." + minorVersion + "." + pointVersion
126+
// def mNextVersionName = majorVersion + "." + minorVersion + "." + (pointVersion + 1)
127+
// def manifestContent = matcherVersionNumber.replaceAll("versionName \"" + mNextVersionName + "\"")
128+
// println("> Set versionName(" + mVersionName + ") to " + mNextVersionName);
129+
// manifestFile.write(manifestContent)
130+
// }
131+
//}

0 commit comments

Comments
 (0)