Skip to content

Commit 6d2bb27

Browse files
sidzisid-dob
authored andcommitted
fixed versioning system/ improved
1 parent a4af6f2 commit 6d2bb27

File tree

3 files changed

+23
-12
lines changed

3 files changed

+23
-12
lines changed

app/build.gradle

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

3+
ext.versionMajor = 11
4+
ext.versionMinor = 0
5+
ext.versionPatch = 0
6+
7+
ext.minimumSdkVersion = 17
8+
ext.supportLibrariesVersion = '25.3.1'
9+
310
android {
411
compileSdkVersion 25
5-
buildToolsVersion '25.0.1'
12+
buildToolsVersion '25.0.2'
613

714
defaultConfig {
815
applicationId "com.sidzi.circleofmusic"
9-
minSdkVersion 17
16+
minSdkVersion project.ext.minimumSdkVersion
1017
targetSdkVersion 25
11-
versionCode 10
12-
versionName "Igil"
18+
versionCode generateVersionCode()
19+
versionName "Keyboard"
1320
}
1421

1522
buildTypes {
@@ -21,16 +28,20 @@ android {
2128
}
2229
}
2330

31+
private Integer generateVersionCode() {
32+
return ext.minimumSdkVersion * 10000000 + ext.versionMajor * 10000 + ext.versionMinor * 100 + ext.versionPatch
33+
}
34+
2435

2536
dependencies {
2637
compile 'com.android.volley:volley:1.0.0'
2738
compile 'net.gotev:uploadservice:3.1'
2839
compile 'com.j256.ormlite:ormlite-android:5.0'
2940
compile 'com.j256.ormlite:ormlite-core:5.0'
3041
compile 'com.rollbar:rollbar-android:0.2.0'
31-
compile 'com.android.support:appcompat-v7:25.1.0'
32-
compile 'com.android.support:support-v13:25.1.0'
33-
compile 'com.android.support:design:25.1.0'
34-
compile 'com.android.support:recyclerview-v7:25.1.0'
35-
compile 'com.android.support:support-v4:25.1.0'
36-
}
42+
compile "com.android.support:appcompat-v7:$supportLibrariesVersion"
43+
compile "com.android.support:support-v13:$supportLibrariesVersion"
44+
compile "com.android.support:design:$supportLibrariesVersion"
45+
compile "com.android.support:recyclerview-v7:$supportLibrariesVersion"
46+
compile "com.android.support:support-v4:$supportLibrariesVersion"
47+
}

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:2.2.3'
8+
classpath 'com.android.tools.build:gradle:2.3.1'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ 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-3.3-all.zip

0 commit comments

Comments
 (0)