Skip to content
This repository has been archived by the owner on May 9, 2023. It is now read-only.

Update DataAccessAuditing sample for Android API-level 30 #5

Merged
merged 2 commits into from
Jun 10, 2020
Merged

Update DataAccessAuditing sample for Android API-level 30 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df75678
Update DataAccessAuditing sample for Android API-level 30
ggfan Jun 9, 2020
24f0a44
minor update to android gradle plugin 4.0
ggfan Jun 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions DataAccessAuditingKotlin/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'

android {
compileSdkVersion 'android-R'
buildToolsVersion "29.0.3"
compileSdkVersion 30
buildToolsVersion "30.0.0"

defaultConfig {
applicationId "com.example.android.dataaccessauditingkotlin"
minSdkVersion 'R'
targetSdkVersion 'R'
minSdkVersion 30
targetSdkVersion 30
versionCode 1
versionName "1.0"

Expand Down
4 changes: 2 additions & 2 deletions DataAccessAuditingKotlin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.3.71'
ext.kotlin_version = '1.3.72'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.2'
classpath 'com.android.tools.build:gradle:4.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
Expand Down
4 changes: 2 additions & 2 deletions DataAccessAuditingKotlin/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Mar 26 07:44:11 PDT 2020
#Wed Jun 10 11:09:37 PDT 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
8 changes: 4 additions & 4 deletions DataAccessAuditingKotlin/thirdPartyLibrary/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion 'android-R'
buildToolsVersion "30.0.0 rc2"
compileSdkVersion 30
buildToolsVersion "30.0.0"

defaultConfig {
minSdkVersion 'R'
targetSdkVersion 'R'
minSdkVersion 30
targetSdkVersion 30
versionCode 1
versionName "1.0"

Expand Down