Skip to content

Commit

Permalink
Upgrade dependencies and gradle, bump version (#36)
Browse files Browse the repository at this point in the history
* Upgrade dependencies and gradle

* upgrade target sdk to 29

* Upgrade travis to build against android sdk 29

* Upgrade min android to 24(7.0) and target android to 29(10/Q)

* Fixed the shallow clone issue in travis

* Added 1.6 apk
  • Loading branch information
xRahul authored Oct 12, 2019
1 parent a18966d commit ecf9a93
Show file tree
Hide file tree
Showing 10 changed files with 147 additions and 52 deletions.
134 changes: 109 additions & 25 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ language: android
sudo: false
jdk: oraclejdk8

# Added to avoid shallow clone issue
git:
depth: false

addons:
sonarcloud:
organization: "xrahul-github" # the key of the org you chose at step #3
Expand All @@ -17,17 +21,18 @@ android:
- tools

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

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


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

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

before_script:
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
[![SonarCloud Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=GroupingMessages%3Aapp&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=GroupingMessages%3Aapp)


This is an android app that automatically categorizes your sms into various categories of your choice. Target Android 28 (Pie)
This is an android app that automatically categorizes your sms into various categories of your choice. Target Android 29 (Q)
Minimum supported Android: 7.0 (Nougat)

Every trained model will be user specific, so each user can categorize their sms according to their needs.
It requires some learning at the beginning,
Expand Down
Binary file added app/apks/GroupingMessages 1.6.apk
Binary file not shown.
23 changes: 12 additions & 11 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ android {
return void
}
buildTypes {
debug {
debuggable true
shrinkResources false
minifyEnabled false
proguardFile 'proguard-guava.pro'
proguardFile getDefaultProguardFile('proguard-android-optimize.txt')
proguardFile 'proguard-rules.pro'
}
release {
shrinkResources true
minifyEnabled true
Expand All @@ -25,20 +33,13 @@ android {
jniDebuggable false
zipAlignEnabled true
}
debug {
debuggable true
shrinkResources false
minifyEnabled false
proguardFile 'proguard-guava.pro'
proguardFile getDefaultProguardFile('proguard-android-optimize.txt')
proguardFile 'proguard-rules.pro'
}
}
return void
}

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')

implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
implementation "com.android.support:preference-v7:${rootProject.ext.supportLibVersion}"
implementation "com.android.support:design:${rootProject.ext.supportLibVersion}"
Expand All @@ -49,10 +50,10 @@ dependencies {
implementation 'com.github.QuadFlask:colorpicker:0.0.13'
implementation 'com.github.mpkorstanje:simmetrics-core:4.1.1'
implementation 'com.pavelsikun:material-seekbar-preference:2.3.0'
implementation 'org.apache.commons:commons-collections4:4.2'
implementation 'org.apache.commons:commons-collections4:4.4'

compileOnly 'org.projectlombok:lombok:1.18.4'
annotationProcessor 'org.projectlombok:lombok:1.18.4'
compileOnly 'org.projectlombok:lombok:1.18.10'
annotationProcessor 'org.projectlombok:lombok:1.18.10'

androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
Expand Down
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1'
classpath 'com.android.tools.build:gradle:3.5.1'
classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.8'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -31,15 +31,15 @@ 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 = 28
compileSdkVersion = 29
// You can also create properties to specify versions for dependencies.
// Having consistent versions between modules can avoid conflicts with behavior.
supportLibVersion = '28.0.0'
gmsFirebaseVersion = '16.0.6'
minSdkVersion = 23
targetSdkVersion = 28
minSdkVersion = 24
targetSdkVersion = 29
jUnitVersion = '4.12'
applicationId = 'in.rahulja.groupingmessages'
versionCode = 15
versionName = '1.5'
versionCode = 16
versionName = '1.6'
}
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 May 06 11:37:25 IST 2017
#Sat Oct 12 15:13:00 SGT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
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=GroupingMessages:app
# this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1.
sonar.projectName=GroupingMessages
sonar.projectVersion=1.5
sonar.projectVersion=1.6

# 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 ecf9a93

Please sign in to comment.