|
1 | 1 | /* |
2 | | - * Copyright 2025 The Android Open Source Project |
| 2 | + * Copyright 2026 The Android Open Source Project |
3 | 3 | * |
4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
5 | 5 | * you may not use this file except in compliance with the License. |
|
16 | 16 |
|
17 | 17 | plugins { |
18 | 18 | alias(libs.plugins.android.application) |
19 | | - alias(libs.plugins.kotlin.android) |
20 | 19 | alias(libs.plugins.compose.compiler) |
21 | 20 | } |
| 21 | +kotlin { |
| 22 | + android { |
| 23 | + namespace = "com.example.android.helloandroid" |
| 24 | + compileSdk { |
| 25 | + version = release(36) { |
| 26 | + minorApiLevel = 1 |
| 27 | + } |
| 28 | + } |
22 | 29 |
|
23 | | -android { |
24 | | - namespace = "com.example.android.helloandroid" |
25 | | - compileSdk = 36 |
26 | | - |
27 | | - defaultConfig { |
28 | | - applicationId = "com.example.android.helloandroid" |
29 | | - minSdk = 23 |
30 | | - targetSdk = 36 |
31 | | - versionCode = 1 |
32 | | - versionName = "1.0" |
| 30 | + defaultConfig { |
| 31 | + applicationId = "com.example.android.helloandroid" |
| 32 | + minSdk = 23 |
| 33 | + targetSdk = 37 |
| 34 | + versionCode = 1 |
| 35 | + versionName = "1.0" |
33 | 36 |
|
34 | | - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" |
35 | | - vectorDrawables { |
36 | | - useSupportLibrary = true |
| 37 | + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" |
| 38 | + vectorDrawables { |
| 39 | + useSupportLibrary = true |
| 40 | + } |
37 | 41 | } |
38 | | - } |
39 | 42 |
|
40 | | - buildTypes { |
41 | | - release { |
42 | | - isMinifyEnabled = false |
43 | | - proguardFiles( |
44 | | - getDefaultProguardFile("proguard-android-optimize.txt"), |
45 | | - "proguard-rules.pro" |
46 | | - ) |
| 43 | + buildTypes { |
| 44 | + release { |
| 45 | + isMinifyEnabled = false |
| 46 | + proguardFiles( |
| 47 | + getDefaultProguardFile("proguard-android-optimize.txt"), |
| 48 | + "proguard-rules.pro" |
| 49 | + ) |
| 50 | + } |
| 51 | + } |
| 52 | + compileOptions { |
| 53 | + sourceCompatibility = JavaVersion.VERSION_17 |
| 54 | + targetCompatibility = JavaVersion.VERSION_17 |
| 55 | + } |
| 56 | + buildFeatures { |
| 57 | + compose = true |
47 | 58 | } |
48 | | - } |
49 | | - compileOptions { |
50 | | - sourceCompatibility = JavaVersion.VERSION_1_8 |
51 | | - targetCompatibility = JavaVersion.VERSION_1_8 |
52 | | - } |
53 | | - buildFeatures { |
54 | | - compose = true |
55 | | - } |
56 | 59 |
|
57 | | - packaging { |
58 | | - resources { |
59 | | - excludes += "/META-INF/{AL2.0,LGPL2.1}" |
| 60 | + packaging { |
| 61 | + resources { |
| 62 | + excludes += "/META-INF/{AL2.0,LGPL2.1}" |
| 63 | + } |
60 | 64 | } |
61 | 65 | } |
62 | | -} |
63 | 66 |
|
64 | | -kotlin { |
65 | 67 | compilerOptions { |
66 | | - jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8) |
| 68 | + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17) |
67 | 69 | } |
68 | 70 | } |
69 | 71 |
|
|
0 commit comments