Skip to content

Commit

Permalink
update gradle build tool & depdendencies version
Browse files Browse the repository at this point in the history
  • Loading branch information
skydoves committed Aug 4, 2019
1 parent 4f64dd5 commit e7eef5a
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 19 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ captures/
.idea/dictionaries
.idea/libraries

# Mac
*.DS_Store

# Keystore files
*.jks

Expand All @@ -53,4 +56,4 @@ google-services.json
# Freeline
freeline.py
freeline/
freeline_project_description.json
freeline_project_description.json
17 changes: 10 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,28 @@ android:
components:
- tools
- platform-tools
- build-tools-28.0.3
- android-28
- build-tools-29.0.0
- android-29
- extra-android-support
- extra-android-m2repository
- extra-google-m2repository

jdk:
- oraclejdk8
- openjdk8

branches:
except:
- gh-pages


licenses:
- '.+'

notifications:
email: false

cache:
directories:
- $HOME/.gradle

script:
- chmod +x ./gradlew
- chmod +x ./gradlew
2 changes: 1 addition & 1 deletion androidveil/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ android {
}

dependencies {
implementation "androidx.appcompat:appcompat:$versions.androidxAppcompat"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin"
implementation "androidx.appcompat:appcompat:$versions.androidxAppcompat"
implementation "androidx.recyclerview:recyclerview:$versions.recyclerView"
implementation "com.github.skydoves:baserecyclerviewadapter:$versions.baseAdapter"
api "com.facebook.shimmer:shimmer:$versions.shimmer"
Expand Down
10 changes: 4 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,17 @@ android {
versionCode versions.versionCode
versionName versions.versionName
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$versions.kotlin"
implementation "androidx.appcompat:appcompat:$versions.androidxAppcompat"
implementation "com.google.android.material:material:$versions.googleMaterial"
implementation "androidx.recyclerview:recyclerview:$versions.recyclerView"
implementation "com.google.android.material:material:$versions.googleMaterial"
implementation "com.github.skydoves:baserecyclerviewadapter:$versions.baseAdapter"
implementation "io.reactivex.rxjava2:rxjava:$versions.rxjava2"
implementation "io.reactivex.rxjava2:rxandroid:$versions.rxAndroid"
Expand Down
10 changes: 6 additions & 4 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,19 @@ ext.versions = [
versionCode : 7,
versionName : '1.0.6',

gradleBuildTool : '3.4.1',
spotlessGradle : '3.22.0',
gradleBuildTool : '3.4.2',
spotlessGradle : '3.23.1',
dokkaGradle : '0.9.18',
bintrayRelease : '0.9',

kotlin : '1.3.31',
kotlin : '1.3.41',
androidxAppcompat : '1.1.0-rc01',
googleMaterial : '1.1.0-alpha07',
googleMaterial : '1.1.0-alpha08',
recyclerView : '1.1.0-beta01',
shimmer : '0.4.0',
baseAdapter : '0.1.3',

// for demo
rxjava2 : '2.1.8',
rxAndroid : '2.1.1'
]

0 comments on commit e7eef5a

Please sign in to comment.