Skip to content
Snippets Groups Projects
Unverified Commit 7d82e612 authored by Jakob Möller's avatar Jakob Möller Committed by GitHub
Browse files

Gradle Reset to 0.5.4 (#53)

* Release/0.5.5 (#48)

* Hotfix for resetting Gradle Version (internal pipeline confirmation) (#52)
parent 4149e40c
No related branches found
Tags 1.6.0-SNAPSHOT-RC1
No related merge requests found
...@@ -12,8 +12,8 @@ jobs: ...@@ -12,8 +12,8 @@ jobs:
steps: steps:
- checkout - checkout
- install-ndk: - install-ndk:
ndk-sha: "c81a5bcb4672a18d3647bf6898cd4dbcb978d0e8" ndk-sha: "50250fcba479de477b45801e2699cca47f7e1267"
ndk-version: "android-ndk-r21c" ndk-version: "android-ndk-r21b"
- restore-build-cache - restore-build-cache
- restore_cache: - restore_cache:
key: jars-{{ checksum "build.gradle" }}-{{ checksum "Corona-Warn-App/build.gradle" }}-{{ checksum "Server-Protocol-Buffer/build.gradle" }} key: jars-{{ checksum "build.gradle" }}-{{ checksum "Corona-Warn-App/build.gradle" }}-{{ checksum "Server-Protocol-Buffer/build.gradle" }}
......
...@@ -24,7 +24,7 @@ apply plugin: 'kotlin-kapt' ...@@ -24,7 +24,7 @@ apply plugin: 'kotlin-kapt'
apply plugin: "androidx.navigation.safeargs.kotlin" apply plugin: "androidx.navigation.safeargs.kotlin"
android { android {
ndkVersion "21.2.6472646" ndkVersion "21.1.6352462"
compileSdkVersion 29 compileSdkVersion 29
buildToolsVersion "29.0.3" buildToolsVersion "29.0.3"
...@@ -196,6 +196,6 @@ dependencies { ...@@ -196,6 +196,6 @@ dependencies {
implementation "androidx.security:security-crypto:1.0.0-rc02" implementation "androidx.security:security-crypto:1.0.0-rc02"
implementation 'net.zetetic:android-database-sqlcipher:4.4.0' implementation 'net.zetetic:android-database-sqlcipher:4.4.0'
implementation "androidx.sqlite:sqlite:2.1.0" implementation "androidx.sqlite:sqlite:2.0.1"
} }
...@@ -13,7 +13,7 @@ buildscript { ...@@ -13,7 +13,7 @@ buildscript {
} }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.0.0' classpath 'com.android.tools.build:gradle:3.6.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.google.protobuf:protobuf-gradle-plugin:$protobufVersion" classpath "com.google.protobuf:protobuf-gradle-plugin:$protobufVersion"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navVersion" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navVersion"
......
#Sat May 30 21:32:47 CEST 2020 #Mon Apr 27 13:24:14 CEST 2020
distributionBase=GRADLE_USER_HOME 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.1.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment