Skip to content

Commit

Permalink
[*] updated dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
nisrulz committed Nov 30, 2016
1 parent f5c6ded commit 48d9da2
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 60 deletions.
16 changes: 0 additions & 16 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
/*
* Copyright (C) 2016 Nishant Srivastava
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

apply plugin: 'com.android.application'

android {
Expand Down
28 changes: 6 additions & 22 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
/*
* Copyright (C) 2016 Nishant Srivastava
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
Expand All @@ -27,7 +11,7 @@ buildscript {
// in the individual module build.gradle files

// Required plugins added to classpath to facilitate pushing to Jcenter/Bintray
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
}
}
Expand All @@ -44,16 +28,16 @@ task clean(type: Delete) {

ext {
compileSdkVersion = 25
buildToolsVersion = "25.0.0"
buildToolsVersion = "25.0.1"
minSdkVersion = 9
targetSdkVersion = 25

supportLibVersion = '25.0.0'
googlePlayServicesVersion = '9.8.0'
supportLibVersion = '25.0.1'
googlePlayServicesVersion = '10.0.1'

// EasyDeviceInfo
easyDeviceInfoVersionCode = 21
easyDeviceInfoVersionName = "2.3.1"
easyDeviceInfoVersionCode = 22
easyDeviceInfoVersionName = "2.3.2"
easyDeviceInfoPomUrl = "https://github.com/nisrulz/easydeviceinfo"
easyDeviceInfoPomGitUrl = "https://github.com/nisrulz/easydeviceinfo.git"
easyDeviceInfoGithubRepo = "nisrulz/easydeviceinfo"
Expand Down
2 changes: 1 addition & 1 deletion easydeviceinfo-ads/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ dependencies {

compile "com.google.android.gms:play-services-basement:$rootProject.ext.googlePlayServicesVersion"

// compile "com.github.nisrulz:easydeviceinfo-common:$rootProject.ext.easyDeviceInfoVersionName"
// compile "com.github.nisrulz:easydeviceinfo-common:$rootProject.ext.easyDeviceInfoVersionName"

compile project(':easydeviceinfo-common')
}
Expand Down
3 changes: 2 additions & 1 deletion easydeviceinfo-base/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,10 @@ dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
testCompile 'junit:junit:4.12'

// compile "com.github.nisrulz:easydeviceinfo-common:$rootProject.ext.easyDeviceInfoVersionName"
// compile "com.github.nisrulz:easydeviceinfo-common:$rootProject.ext.easyDeviceInfoVersionName"

compile project(':easydeviceinfo-common')

compile "com.android.support:support-annotations:$rootProject.ext.supportLibVersion"
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ public static void setConfigs(String notFoundVal, boolean debugFlag) {
* @return the library version
*/
public static String getLibraryVersion() {
int versionCode = 21;
String version = "v2.3.1";
int versionCode = BuildConfig.VERSION_CODE;
String version = "v" + BuildConfig.VERSION_NAME;
return nameOfLib + " : " + version + " [build-" + versionCode + "]";
}

Expand Down
20 changes: 2 additions & 18 deletions easydeviceinfo/build.gradle
Original file line number Diff line number Diff line change
@@ -1,19 +1,3 @@
/*
* Copyright (C) 2016 Nishant Srivastava
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

apply plugin: 'com.android.library'

android {
Expand Down Expand Up @@ -56,8 +40,8 @@ dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
testCompile 'junit:junit:4.12'

// compile "com.github.nisrulz:easydeviceinfo-ads:$rootProject.ext.easyDeviceInfoVersionName"
// compile "com.github.nisrulz:easydeviceinfo-base:$rootProject.ext.easyDeviceInfoVersionName"
// compile "com.github.nisrulz:easydeviceinfo-ads:$rootProject.ext.easyDeviceInfoVersionName"
// compile "com.github.nisrulz:easydeviceinfo-base:$rootProject.ext.easyDeviceInfoVersionName"

compile project(':easydeviceinfo-ads')
compile project(':easydeviceinfo-base')
Expand Down

0 comments on commit 48d9da2

Please sign in to comment.