Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 8 additions & 16 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
plugins {
id "com.android.application"
id "kotlin-android"
}
apply plugin: "shot"

android {
compileSdkVersion 30
buildToolsVersion "30.0.2"
compileSdkVersion 34
buildToolsVersion "34.0.0"

namespace "com.karumi.shotconsumercompose"

defaultConfig {
applicationId "com.karumi.shotconsumercompose"
Expand Down Expand Up @@ -42,16 +43,10 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = "1.8"
useIR = true
}
buildFeatures {
compose true
}
composeOptions {
kotlinCompilerExtensionVersion compose_version
kotlinCompilerVersion kotlin_version
}
packagingOptions {
exclude "META-INF/*"
Expand All @@ -70,24 +65,21 @@ shot {

dependencies {

implementation "androidx.core:core-ktx:1.3.2"
implementation "androidx.appcompat:appcompat:1.2.0"
implementation "com.google.android.material:material:1.3.0"
implementation "androidx.appcompat:appcompat:1.6.1"
implementation "com.google.android.material:material:1.10.0"
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.material:material:$compose_version"
implementation "androidx.compose.ui:ui-tooling:$compose_version"
implementation "androidx.activity:activity-compose:1.3.0-alpha05"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.3.1"
implementation "androidx.activity:activity-compose:1.8.0"
implementation "androidx.lifecycle:lifecycle-runtime:2.6.2"

testImplementation "junit:junit:4.13.1"

androidTestUtil "androidx.test:orchestrator:1.4.1"

androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
androidTestImplementation "androidx.test.espresso:espresso-core:3.3.0"
androidTestImplementation "androidx.test:core-ktx:1.3.0"
androidTestImplementation "androidx.test:core:1.3.0"
androidTestImplementation "androidx.test:runner:1.3.0"
androidTestImplementation "androidx.test.ext:junit:1.1.2"
androidTestImplementation "androidx.test.ext:junit-ktx:1.1.2"
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class MainActivity : AppCompatActivity() {

@Composable
fun Greeting(name: String) {
Text(text = "Hello $name!")
Text(text = "Hello, $name!")
}

@Preview(showBackground = true)
Expand All @@ -46,4 +46,4 @@ fun DefaultPreview() {
@Composable
fun RoundedCornersBox() {
Box(Modifier.background(color = Color(0xFF4E62FD), shape = RoundedCornerShape(size = 20.dp)).width(100.dp).height(100.dp))
}
}
4 changes: 2 additions & 2 deletions app/src/main/java/com/karumi/shotconsumercompose/ui/Color.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.karumi.shotconsumercompose.ui

import androidx.compose.ui.graphics.Color

val purple200 = Color(0xFFBB86FC)
val purple200 = Color(0xFF000000)
val purple500 = Color(0xFF6200EE)
val purple700 = Color(0xFF3700B3)
val teal200 = Color(0xFF03DAC5)
val teal200 = Color(0xFF03DAC5)
11 changes: 7 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext {
compose_version = '1.0.0-beta03'
compose_version = '1.5.4'
}
ext.kotlin_version = "1.4.31"
repositories {
google()
mavenLocal()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.0-alpha12'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.karumi:shot:5.14.1"
}
}

plugins {
id("com.android.application") version "8.1.0" apply false
id("com.android.library") version "8.1.0" apply false
id("org.jetbrains.kotlin.android") version "1.5.31" apply false
}

allprojects {
repositories {
google()
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
11 changes: 11 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,2 +1,13 @@
pluginManagement {
repositories {
google()
mavenLocal()
gradlePluginPortal()
maven {
url "/home/arnold/myLocal"
}
}
}

rootProject.name = "shot-consumer-compose"
include ':app'