Skip to content

Commit f4aa6b9

Browse files
committed
kotlin 1.8.10
1 parent 3408e4c commit f4aa6b9

File tree

5 files changed

+28
-28
lines changed

5 files changed

+28
-28
lines changed

build.gradle

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
// Root project build.gradle
22
buildscript {
33
ext {
4-
java_version = JavaVersion.VERSION_11.toString()
5-
build_tools_version = '32.0.0'
6-
compile_sdk = 32
7-
target_sdk = 32
4+
build_tools_version = '33.0.2'
5+
compile_sdk = 33
6+
target_sdk = 33
87
min_sdk = 21
9-
agp_version = '7.3.1'
10-
kotlin_version = '1.7.0'
11-
kotlin_compiler_extension_version = '1.2.0'
12-
compose_version = '1.3.1'
13-
material_version = '1.7.0'
14-
appcompat_version = '1.5.1'
8+
agp_version = '7.4.1'
9+
kotlin_version = '1.8.10'
10+
kotlin_compiler_extension_version = '1.4.2'
11+
compose_version = '1.3.3'
12+
material_version = '1.8.0'
13+
appcompat_version = '1.6.0'
1514
preference_version = '1.2.0'
1615
core_version = '1.9.0'
1716
nav_version = '2.5.3'
1817
junit_version = '4.13.2'
19-
version_name = '1.1.3'
20-
version_code = 13
18+
version_name = '1.1.4'
19+
version_code = 14
2120
}
2221
}
2322

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip

library/build.gradle

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ plugins {
88

99
android {
1010
compileSdk compile_sdk
11+
namespace 'io.syslogic.colorpicker'
1112
defaultConfig {
1213
minSdk min_sdk
1314
targetSdk target_sdk
@@ -17,11 +18,11 @@ android {
1718
consumerProguardFiles "${project.rootDir}/proguard/consumer.pro"
1819
}
1920
compileOptions {
20-
sourceCompatibility java_version
21-
targetCompatibility java_version
21+
sourceCompatibility JavaVersion.VERSION_11.toString()
22+
targetCompatibility JavaVersion.VERSION_11.toString()
2223
}
2324
kotlinOptions {
24-
jvmTarget = java_version
25+
jvmTarget = 11
2526
}
2627
composeOptions {
2728
kotlinCompilerExtensionVersion kotlin_compiler_extension_version
@@ -72,10 +73,10 @@ dependencies {
7273

7374
// https://mvnrepository.com/artifact/androidx.compose
7475
implementation "androidx.compose.ui:ui:$compose_version"
75-
implementation "androidx.compose.material:material:$compose_version"
76-
implementation "androidx.compose.foundation:foundation:$compose_version"
77-
// implementation "androidx.compose.material:material-icons-core:$compose_version"
78-
// implementation 'androidx.compose.material:material-icons-extended:$compose_version'
76+
implementation "androidx.compose.material:material:1.3.1"
77+
implementation "androidx.compose.foundation:foundation:1.3.1"
78+
// implementation "androidx.compose.material:material-icons-core:1.3.1"
79+
// implementation 'androidx.compose.material:material-icons-extended:1.3.1'
7980

8081
/* Composable Preview */
8182
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"

library/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest package="io.syslogic.colorpicker" />
2+
<manifest />

mobile/build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ android {
1818
minSdk min_sdk
1919
}
2020
compileOptions {
21-
sourceCompatibility java_version
22-
targetCompatibility java_version
21+
sourceCompatibility JavaVersion.VERSION_11.toString()
22+
targetCompatibility JavaVersion.VERSION_11.toString()
2323
}
2424
kotlinOptions {
25-
jvmTarget = java_version
25+
jvmTarget = 11
2626
}
2727
composeOptions {
2828
kotlinCompilerExtensionVersion kotlin_compiler_extension_version
@@ -68,15 +68,15 @@ dependencies {
6868
implementation "androidx.activity:activity-compose:1.6.1"
6969
implementation "androidx.compose.ui:ui:$compose_version"
7070
implementation "androidx.compose.runtime:runtime:$compose_version"
71-
implementation "androidx.compose.material:material:$compose_version"
72-
implementation "androidx.compose.foundation:foundation:$compose_version"
71+
implementation "androidx.compose.material:material:1.3.1"
72+
implementation "androidx.compose.foundation:foundation:1.3.1"
7373
debugImplementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
7474

7575
testImplementation "junit:junit:$junit_version"
76-
androidTestImplementation "androidx.test.ext:junit:1.1.4"
76+
androidTestImplementation "androidx.test.ext:junit:1.1.5"
7777
androidTestImplementation "androidx.navigation:navigation-testing:$nav_version"
7878
androidTestImplementation "androidx.test.uiautomator:uiautomator:2.2.0"
79-
androidTestImplementation "androidx.test.espresso:espresso-core:3.5.0"
79+
androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
8080

8181
// Test rules and transitive dependencies:
8282
androidTestImplementation("androidx.compose.ui:ui-test-junit4:$compose_version")

0 commit comments

Comments
 (0)