Skip to content

Commit

Permalink
Upgrade dependencies, target SDK to 28, version to 1.7 (#12)
Browse files Browse the repository at this point in the history
* Upgrade dependencies, target SDK to 28, version to 1.7

* Changed Travis config to use latest dependencies

* Added Signed Built APK
  • Loading branch information
xRahul authored Jan 1, 2019
1 parent 95f261d commit c06ab16
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 23 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ android:
- tools

# The BuildTools version used by your project
- build-tools-27.0.3
- build-tools-28.0.3

# The SDK version used to compile your project
- android-27
- android-28


- extra
- extra-google-google_play_services
- extra-google-m2repository
- extra-android-m2repository
- addon-google_apis-google-27
- addon-google_apis-google-28
- addon-google_apis-google-23
- add-on
- addon
Expand All @@ -38,7 +38,7 @@ android:
# - sys-img-armeabi-v7a-google_apis-27

before_install:
- yes | sdkmanager "platforms;android-27"
- yes | sdkmanager "platforms;android-28"
- chmod +x gradlew

before_script:
Expand Down
Binary file added app/APKs/FicsaveMiddleware 1.7.apk
Binary file not shown.
1 change: 0 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ apply plugin: "org.sonarqube"

android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
defaultConfig {
applicationId rootProject.ext.applicationId
minSdkVersion rootProject.ext.minSdkVersion
Expand Down
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:usesCleartextTraffic="true"
android:theme="@style/AppTheme">
<meta-data
android:name="firebase_analytics_collection_deactivated"
Expand Down
21 changes: 10 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.1.4'
classpath 'com.google.gms:google-services:4.1.0'
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.google.gms:google-services:4.2.0'
classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6.2"

// NOTE: Do not place your application dependencies here; they belong
Expand All @@ -30,18 +30,17 @@ task clean(type: Delete) {
// modules in the project.
ext {
// The following are only a few examples of the types of properties you can define.
compileSdkVersion = 27
buildToolsVersion = "27.0.3"
compileSdkVersion = 28
// You can also create properties to specify versions for dependencies.
// Having consistent versions between modules can avoid conflicts with behavior.
supportLibVersion = "27.1.1"
gmsPlayServicesAnalyticsVersion = "16.0.3"
gmsFirebaseCoreVersion = "16.0.3"
gmsFirebaseMessagingVersion = "17.3.1"
supportLibVersion = "28.0.0"
gmsPlayServicesAnalyticsVersion = "16.0.6"
gmsFirebaseCoreVersion = "16.0.6"
gmsFirebaseMessagingVersion = "17.3.4"
jUnitVersion = "4.12"
minSdkVersion = 23
targetSdkVersion = 27
targetSdkVersion = 28
applicationId = "in.rahulja.ficsavemiddleware"
versionCode = 16
versionName = "1.6"
versionCode = 17
versionName = "1.7"
}
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat Sep 08 17:17:11 IST 2018
#Tue Jan 01 15:00:34 IST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
8 changes: 4 additions & 4 deletions in.rahulja.ficsavemiddleware.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ being used for debugging purposes only.
Repo Type:git
Repo:https://github.com/xRahul/FicsaveMiddleware.git

Build:1.6,16
commit=1.6
Build:1.7,17
commit=1.7
subdir=app
gradle=yes

Auto Update Mode:Version %v
Update Check Mode:Tags
Current Version:1.6
Current Version Code:16
Current Version:1.7
Current Version Code:17
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
sonar.projectKey=FicsaveMiddleware:app
# this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1.
sonar.projectName=FicsaveMiddleware
sonar.projectVersion=1.6
sonar.projectVersion=1.7

# Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows.
# This property is optional if sonar.modules is set.
Expand Down

0 comments on commit c06ab16

Please sign in to comment.