File tree Expand file tree Collapse file tree 11 files changed +246
-195
lines changed Expand file tree Collapse file tree 11 files changed +246
-195
lines changed Original file line number Diff line number Diff line change @@ -61,11 +61,11 @@ jobs:
6161 npm run lint
6262 npm test
6363
64- - name : Java 15
65- uses : actions/setup-java@v3
64+ - uses : actions/setup-java@v3
6665 with :
6766 distribution : ' zulu'
68- java-version : 15
67+ java-version : 19
68+
6969 - uses : actions/cache@v3
7070 id : avd-cache
7171 with :
Original file line number Diff line number Diff line change @@ -51,17 +51,14 @@ jobs:
5151 npm run lint
5252 npm test
5353
54- - name : Java 15
55- uses : actions/setup-java@v3
54+ - uses : actions/setup-java@v3
5655 with :
5756 distribution : ' zulu'
58- java-version : 15
59- - uses : actions/cache@v3
57+ java-version : 19
58+
59+ - uses : gradle/gradle-build-action@v2
6060 with :
61- path : |
62- ~/.gradle/caches
63- ~/.gradle/wrapper
64- key : ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
61+ gradle-home-cache-cleanup : true
6562
6663 - name : run action
6764 uses : ./
Original file line number Diff line number Diff line change 1+ .gradle
2+ build /
3+ target /
4+ out /
5+ local.properties
6+ .idea /
7+ * .iml
8+ * .DS_Store
Original file line number Diff line number Diff line change @@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
33
44android {
55 compileSdkVersion 33
6- buildToolsVersion " 33.0.0 "
6+ buildToolsVersion " 33.0.2 "
77
88 defaultConfig {
99 applicationId " com.example.testapp"
@@ -15,18 +15,21 @@ android {
1515 testInstrumentationRunner " androidx.test.runner.AndroidJUnitRunner"
1616 }
1717
18- buildTypes {
19- release {
20- minifyEnabled false
21- proguardFiles getDefaultProguardFile(' proguard-android-optimize.txt' ), ' proguard-rules.pro'
22- }
18+ compileOptions {
19+ sourceCompatibility JavaVersion . VERSION_11
20+ targetCompatibility JavaVersion . VERSION_11
21+ }
22+ }
23+
24+ tasks. withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile ). configureEach {
25+ compilerOptions {
26+ jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget . JVM_11
2327 }
2428}
2529
2630dependencies {
2731 implementation fileTree(dir : ' libs' , include : [' *.jar' ])
28- implementation " org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version "
2932 implementation ' androidx.appcompat:appcompat:1.6.1'
30- androidTestImplementation ' androidx.test.ext:junit:1.1.3 '
31- androidTestImplementation ' androidx.test.espresso:espresso-core:3.4.0 '
33+ androidTestImplementation ' androidx.test.ext:junit:1.1.5 '
34+ androidTestImplementation ' androidx.test.espresso:espresso-core:3.5.1 '
3235}
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 11// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
33buildscript {
4- ext. kotlin_version = ' 1.7.0'
54 repositories {
65 google()
76 mavenCentral()
87 }
98 dependencies {
10- classpath ' com.android.tools.build:gradle:7.2.1 '
11- classpath " org.jetbrains.kotlin:kotlin-gradle-plugin:$k otlin_version "
9+ classpath ' com.android.tools.build:gradle:7.4.2 '
10+ classpath " org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10 "
1211
1312 // NOTE: Do not place your application dependencies here; they belong
1413 // in the individual module build.gradle files
Original file line number Diff line number Diff line change @@ -2,26 +2,11 @@ org.gradle.parallel=true
22org.gradle.configureondemand =true
33org.gradle.caching =true
44
5- # Enable Kotlin incremental compilation
6- kotlin.incremental =true
7-
85# Enable parallel tasks execution for Kotlin Gradle plugin
96kotlin.parallel.tasks.in.project =true
107
118# Kotlin code style
129kotlin.code.style =official
1310
14- # Run kapt directly using Gradle workers
15- kapt.use.worker.api =true
16-
17- # Enable incremental annotation processor for KAPT
18- kapt.incremental.apt =true
19-
20- # Turn off AP discovery in compile path to enable compile avoidance
21- kapt.include.compile.classpath =false
22-
23- # Use R8 instead of ProGuard for code shrinking.
24- android.enableR8.fullMode =true
25-
2611# Enable AndroidX
2712android.useAndroidX =true
Original file line number Diff line number Diff line change 1- # Tue Nov 26 18:34:05 AEDT 2019
21distributionBase =GRADLE_USER_HOME
32distributionPath =wrapper/dists
3+ distributionUrl =https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
4+ networkTimeout =10000
45zipStoreBase =GRADLE_USER_HOME
56zipStorePath =wrapper/dists
6- distributionUrl =https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
You can’t perform that action at this time.
0 commit comments