Migrate to Kotlin DSL (#59)
This commit is contained in:
		
							parent
							
								
									066aa68e80
								
							
						
					
					
						commit
						fa202ff162
					
				@ -1,90 +0,0 @@
 | 
			
		||||
/*
 | 
			
		||||
 * Copyright (C) 2023 The Android Open Source Project
 | 
			
		||||
 *
 | 
			
		||||
 * Licensed under the Apache License, Version 2.0 (the "License");
 | 
			
		||||
 * you may not use this file except in compliance with the License.
 | 
			
		||||
 * You may obtain a copy of the License at
 | 
			
		||||
 *
 | 
			
		||||
 *      https://www.apache.org/licenses/LICENSE-2.0
 | 
			
		||||
 *
 | 
			
		||||
 * Unless required by applicable law or agreed to in writing, software
 | 
			
		||||
 * distributed under the License is distributed on an "AS IS" BASIS,
 | 
			
		||||
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
			
		||||
 * See the License for the specific language governing permissions and
 | 
			
		||||
 * limitations under the License.
 | 
			
		||||
 */
 | 
			
		||||
plugins {
 | 
			
		||||
    id 'com.android.application'
 | 
			
		||||
    id 'org.jetbrains.kotlin.android'
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
android {
 | 
			
		||||
    namespace 'com.example.cupcake'
 | 
			
		||||
    compileSdk 33
 | 
			
		||||
 | 
			
		||||
    defaultConfig {
 | 
			
		||||
        applicationId "com.example.cupcake"
 | 
			
		||||
        minSdk 24
 | 
			
		||||
        targetSdk 33
 | 
			
		||||
        versionCode 1
 | 
			
		||||
        versionName "1.0"
 | 
			
		||||
 | 
			
		||||
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 | 
			
		||||
        vectorDrawables {
 | 
			
		||||
            useSupportLibrary true
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    buildTypes {
 | 
			
		||||
        release {
 | 
			
		||||
            minifyEnabled false
 | 
			
		||||
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    compileOptions {
 | 
			
		||||
        sourceCompatibility JavaVersion.VERSION_1_8
 | 
			
		||||
        targetCompatibility JavaVersion.VERSION_1_8
 | 
			
		||||
    }
 | 
			
		||||
    kotlinOptions {
 | 
			
		||||
        jvmTarget = '1.8'
 | 
			
		||||
        freeCompilerArgs += "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api"
 | 
			
		||||
    }
 | 
			
		||||
    buildFeatures {
 | 
			
		||||
        compose true
 | 
			
		||||
    }
 | 
			
		||||
    composeOptions {
 | 
			
		||||
        kotlinCompilerExtensionVersion '1.4.7'
 | 
			
		||||
    }
 | 
			
		||||
    packagingOptions {
 | 
			
		||||
        resources {
 | 
			
		||||
            excludes += '/META-INF/{AL2.0,LGPL2.1}'
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
dependencies {
 | 
			
		||||
 | 
			
		||||
    implementation platform('androidx.compose:compose-bom:2023.05.00')
 | 
			
		||||
    implementation 'androidx.activity:activity-compose:1.7.1'
 | 
			
		||||
    implementation 'androidx.compose.material3:material3'
 | 
			
		||||
    implementation 'androidx.compose.runtime:runtime'
 | 
			
		||||
    implementation 'androidx.compose.runtime:runtime-livedata'
 | 
			
		||||
    implementation 'androidx.compose.ui:ui'
 | 
			
		||||
    implementation 'androidx.compose.ui:ui-graphics'
 | 
			
		||||
    implementation 'androidx.compose.ui:ui-tooling-preview'
 | 
			
		||||
    implementation 'androidx.core:core-ktx:1.10.0'
 | 
			
		||||
    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 | 
			
		||||
    implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
 | 
			
		||||
    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
 | 
			
		||||
    implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$lifecycle_version"
 | 
			
		||||
    implementation 'androidx.navigation:navigation-compose:2.5.3'
 | 
			
		||||
 | 
			
		||||
    androidTestImplementation platform('androidx.compose:compose-bom:2023.05.00')
 | 
			
		||||
    androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
 | 
			
		||||
    androidTestImplementation 'androidx.navigation:navigation-testing:2.5.3'
 | 
			
		||||
    androidTestImplementation 'androidx.test.espresso:espresso-intents:3.5.1'
 | 
			
		||||
    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
 | 
			
		||||
 | 
			
		||||
    debugImplementation 'androidx.compose.ui:ui-test-manifest'
 | 
			
		||||
    debugImplementation 'androidx.compose.ui:ui-tooling'
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										93
									
								
								app/build.gradle.kts
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										93
									
								
								app/build.gradle.kts
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,93 @@
 | 
			
		||||
/*
 | 
			
		||||
 * Copyright (C) 2023 The Android Open Source Project
 | 
			
		||||
 *
 | 
			
		||||
 * Licensed under the Apache License, Version 2.0 (the "License");
 | 
			
		||||
 * you may not use this file except in compliance with the License.
 | 
			
		||||
 * You may obtain a copy of the License at
 | 
			
		||||
 *
 | 
			
		||||
 *      https://www.apache.org/licenses/LICENSE-2.0
 | 
			
		||||
 *
 | 
			
		||||
 * Unless required by applicable law or agreed to in writing, software
 | 
			
		||||
 * distributed under the License is distributed on an "AS IS" BASIS,
 | 
			
		||||
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
			
		||||
 * See the License for the specific language governing permissions and
 | 
			
		||||
 * limitations under the License.
 | 
			
		||||
 */
 | 
			
		||||
plugins {
 | 
			
		||||
    id("com.android.application")
 | 
			
		||||
    id("org.jetbrains.kotlin.android")
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
android {
 | 
			
		||||
    namespace = "com.example.cupcake"
 | 
			
		||||
    compileSdk = 33
 | 
			
		||||
 | 
			
		||||
    defaultConfig {
 | 
			
		||||
        applicationId = "com.example.cupcake"
 | 
			
		||||
        minSdk = 24
 | 
			
		||||
        targetSdk = 33
 | 
			
		||||
        versionCode = 1
 | 
			
		||||
        versionName = "1.0"
 | 
			
		||||
 | 
			
		||||
        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 | 
			
		||||
        vectorDrawables {
 | 
			
		||||
            useSupportLibrary = true
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    buildTypes {
 | 
			
		||||
        release {
 | 
			
		||||
            isMinifyEnabled = false
 | 
			
		||||
            proguardFiles(
 | 
			
		||||
                getDefaultProguardFile("proguard-android-optimize.txt"),
 | 
			
		||||
                "proguard-rules.pro"
 | 
			
		||||
            )
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    compileOptions {
 | 
			
		||||
        sourceCompatibility = JavaVersion.VERSION_1_8
 | 
			
		||||
        targetCompatibility = JavaVersion.VERSION_1_8
 | 
			
		||||
    }
 | 
			
		||||
    kotlinOptions {
 | 
			
		||||
        jvmTarget = "1.8"
 | 
			
		||||
        freeCompilerArgs += "-opt-in=androidx.compose.material3.ExperimentalMaterial3Api"
 | 
			
		||||
    }
 | 
			
		||||
    buildFeatures {
 | 
			
		||||
        compose = true
 | 
			
		||||
    }
 | 
			
		||||
    composeOptions {
 | 
			
		||||
        kotlinCompilerExtensionVersion = "1.4.7"
 | 
			
		||||
    }
 | 
			
		||||
    packaging {
 | 
			
		||||
        resources {
 | 
			
		||||
            excludes += "/META-INF/{AL2.0,LGPL2.1}"
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
dependencies {
 | 
			
		||||
 | 
			
		||||
    implementation(platform("androidx.compose:compose-bom:2023.05.01"))
 | 
			
		||||
    implementation("androidx.activity:activity-compose:1.7.2")
 | 
			
		||||
    implementation("androidx.compose.material3:material3")
 | 
			
		||||
    implementation("androidx.compose.runtime:runtime")
 | 
			
		||||
    implementation("androidx.compose.runtime:runtime-livedata")
 | 
			
		||||
    implementation("androidx.compose.ui:ui")
 | 
			
		||||
    implementation("androidx.compose.ui:ui-graphics")
 | 
			
		||||
    implementation("androidx.compose.ui:ui-tooling-preview")
 | 
			
		||||
    implementation("androidx.core:core-ktx:1.10.1")
 | 
			
		||||
    implementation("androidx.lifecycle:lifecycle-livedata-ktx:${rootProject.extra["lifecycle_version"]}")
 | 
			
		||||
    implementation("androidx.lifecycle:lifecycle-runtime-ktx:${rootProject.extra["lifecycle_version"]}")
 | 
			
		||||
    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:${rootProject.extra["lifecycle_version"]}")
 | 
			
		||||
    implementation("androidx.lifecycle:lifecycle-viewmodel-savedstate:${rootProject.extra["lifecycle_version"]}")
 | 
			
		||||
    implementation("androidx.navigation:navigation-compose:2.5.3")
 | 
			
		||||
 | 
			
		||||
    androidTestImplementation(platform("androidx.compose:compose-bom:2023.05.01"))
 | 
			
		||||
    androidTestImplementation("androidx.compose.ui:ui-test-junit4")
 | 
			
		||||
    androidTestImplementation("androidx.navigation:navigation-testing:2.5.3")
 | 
			
		||||
    androidTestImplementation("androidx.test.espresso:espresso-intents:3.5.1")
 | 
			
		||||
    androidTestImplementation("androidx.test.ext:junit:1.1.5")
 | 
			
		||||
 | 
			
		||||
    debugImplementation("androidx.compose.ui:ui-test-manifest")
 | 
			
		||||
    debugImplementation("androidx.compose.ui:ui-tooling")
 | 
			
		||||
}
 | 
			
		||||
@ -15,12 +15,12 @@
 | 
			
		||||
 */
 | 
			
		||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
 | 
			
		||||
buildscript {
 | 
			
		||||
    ext {
 | 
			
		||||
        lifecycle_version = "2.6.1"
 | 
			
		||||
    extra.apply {
 | 
			
		||||
        set("lifecycle_version", "2.6.1")
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
plugins {
 | 
			
		||||
    id 'com.android.application' version '8.0.1' apply false
 | 
			
		||||
    id 'com.android.library' version '8.0.1' apply false
 | 
			
		||||
    id 'org.jetbrains.kotlin.android' version '1.8.21' apply false
 | 
			
		||||
    id("com.android.application") version "8.0.2" apply false
 | 
			
		||||
    id("com.android.library") version "8.0.2" apply false
 | 
			
		||||
    id("org.jetbrains.kotlin.android") version "1.8.21" apply false
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								gradle/wrapper/gradle-wrapper.properties
									
									
									
									
										vendored
									
									
								
							@ -1,6 +1,6 @@
 | 
			
		||||
#Sun Mar 19 17:30:22 PDT 2023
 | 
			
		||||
distributionBase=GRADLE_USER_HOME
 | 
			
		||||
distributionPath=wrapper/dists
 | 
			
		||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 | 
			
		||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 | 
			
		||||
zipStoreBase=GRADLE_USER_HOME
 | 
			
		||||
zipStorePath=wrapper/dists
 | 
			
		||||
 | 
			
		||||
@ -28,4 +28,4 @@ dependencyResolutionManagement {
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
rootProject.name = "Cupcake"
 | 
			
		||||
include ':app'
 | 
			
		||||
include(":app")
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user