Compare commits

...

3 Commits

Author SHA1 Message Date
akaessens 43458af11c update android CI workflow java version
enable on all branches
2021-08-10 21:02:41 +02:00
akaessens 2a67c74f57 Update gson dependency 2021-08-10 20:56:54 +02:00
akaessens 8f8d0d07a8 Upgrade gradle to 7.1.1
Repace jcenter with maven as jcenter is deprecated
update dependencies that are more up to date on maven

Gradle 7.1.1 working even though #14 didn't change.
Apparently incopatibility is now shifted to gradle 8, whatever.
2021-08-10 17:55:56 +02:00
4 changed files with 10 additions and 14 deletions

View File

@ -2,9 +2,7 @@ name: Android CI
on: on:
push: push:
branches: [ master ]
pull_request: pull_request:
branches: [ master ]
jobs: jobs:
build: build:
@ -13,9 +11,9 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: set up JDK 1.8 - uses: actions/setup-java@v2
uses: actions/setup-java@v1
with: with:
java-version: 1.8 distribution: 'adopt'
java-version: '11'
- name: Build with Gradle - name: Build with Gradle
run: ./gradlew build run: ./gradlew build

View File

@ -34,7 +34,7 @@ dependencies {
implementation "androidx.webkit:webkit:1.4.0" implementation "androidx.webkit:webkit:1.4.0"
// JSON save/restore shared preference // JSON save/restore shared preference
implementation 'com.google.code.gson:gson:2.8.5' implementation 'com.google.code.gson:gson:2.8.6'
// Theme // Theme
implementation 'com.google.android.material:material:1.4.0' implementation 'com.google.android.material:material:1.4.0'
@ -46,8 +46,8 @@ dependencies {
implementation 'com.squareup.picasso:picasso:2.71828' implementation 'com.squareup.picasso:picasso:2.71828'
// animations and transformations // animations and transformations
implementation 'jp.wasabeef:picasso-transformations:2.2.1' implementation 'jp.wasabeef:picasso-transformations:2.4.0'
implementation 'jp.wasabeef:recyclerview-animators:3.0.0' implementation 'jp.wasabeef:recyclerview-animators:4.0.2'
// tests // tests
testImplementation 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.ext:junit:1.1.3'

View File

@ -4,8 +4,7 @@ buildscript {
repositories { repositories {
google() google()
jcenter() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.1.3' classpath 'com.android.tools.build:gradle:4.1.3'
@ -18,8 +17,7 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
google() google()
jcenter() mavenCentral()
} }
} }

View File

@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
distributionSha256Sum=23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f distributionSha256Sum=bf8b869948901d422e9bb7d1fa61da6a6e19411baa7ad6ee929073df85d6365d