Skip to content

Commit 83f4a10

Browse files
committed
update gradle and compose, make subtle changes to ui
1 parent ab0b3a2 commit 83f4a10

File tree

9 files changed

+288
-340
lines changed

9 files changed

+288
-340
lines changed

app/build.gradle

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
6-
compileSdkVersion 29
5+
compileSdkVersion 31
76

8-
defaultConfig {
9-
applicationId "com.snakydesign.jetpackcomposeparticles"
10-
minSdkVersion 21
11-
targetSdkVersion 29
12-
versionCode 1
13-
versionName "1.0"
7+
defaultConfig {
8+
applicationId "com.snakydesign.jetpackcomposeparticles"
9+
minSdkVersion 21
10+
targetSdkVersion 31
11+
versionCode 1
12+
versionName "1.0"
1413

15-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
16-
}
14+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
15+
}
1716

1817

19-
kotlinOptions {
20-
jvmTarget = "1.8"
21-
}
22-
buildFeatures {
23-
compose true
24-
}
25-
buildTypes {
26-
release {
27-
minifyEnabled false
28-
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
18+
kotlinOptions {
19+
jvmTarget = "1.8"
20+
}
21+
buildFeatures {
22+
compose true
23+
}
24+
buildTypes {
25+
release {
26+
minifyEnabled false
27+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
28+
}
29+
}
30+
composeOptions {
31+
kotlinCompilerExtensionVersion compose_version
32+
}
33+
compileOptions {
34+
sourceCompatibility JavaVersion.VERSION_1_8
35+
targetCompatibility JavaVersion.VERSION_1_8
2936
}
30-
}
31-
compileOptions {
32-
sourceCompatibility JavaVersion.VERSION_1_8
33-
targetCompatibility JavaVersion.VERSION_1_8
34-
}
3537
}
3638

3739
dependencies {
38-
implementation fileTree(dir: "libs", include: ["*.jar"])
39-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
40-
implementation 'androidx.core:core-ktx:1.1.0'
41-
implementation 'androidx.appcompat:appcompat:1.1.0'
42-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
43-
testImplementation 'junit:junit:4.12'
44-
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
45-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
40+
implementation fileTree(dir: "libs", include: ["*.jar"])
41+
implementation 'androidx.core:core-ktx:1.7.0'
42+
implementation 'androidx.appcompat:appcompat:1.3.1'
43+
implementation 'com.google.android.material:material:1.4.0'
44+
implementation "androidx.compose.ui:ui:$compose_version"
45+
implementation "androidx.compose.material:material:$compose_version"
46+
implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
47+
implementation 'androidx.activity:activity-compose:1.4.0'
4648

47-
implementation("androidx.compose:compose-runtime:$compose_version")
48-
implementation("androidx.ui:ui-framework:$compose_version")
49-
implementation("androidx.ui:ui-layout:$compose_version")
50-
implementation("androidx.ui:ui-material:$compose_version")
51-
implementation("androidx.ui:ui-foundation:$compose_version")
52-
implementation("androidx.ui:ui-animation:$compose_version")
53-
implementation "androidx.ui:ui-tooling:$compose_version"
49+
testImplementation 'junit:junit:4.13.2'
50+
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
51+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
52+
androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
53+
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
5454
}

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
android:theme="@style/AppTheme">
1212
<activity
1313
android:name=".ClockActivity"
14+
android:exported="true"
1415
android:label="@string/title_activity_main2"
1516
android:theme="@style/AppTheme.NoActionBar">
1617
<intent-filter>

app/src/main/java/com/snakydesign/clock/Animations.kt

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)