File tree Expand file tree Collapse file tree 8 files changed +23
-21
lines changed Expand file tree Collapse file tree 8 files changed +23
-21
lines changed Original file line number Diff line number Diff line change 11// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
33buildscript {
4- ext. kotlin_version = ' 1.9.23 '
4+ ext. kotlin_version = ' 2.1.0 '
55
66 repositories {
77 google()
88 mavenCentral()
99 }
1010 dependencies {
11- classpath ' com.android.tools.build:gradle:8.4.0 '
11+ classpath ' com.android.tools.build:gradle:8.7.3 '
1212 classpath " org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version "
1313
14-
1514 // NOTE: Do not place your application dependencies here; they belong
1615 // in the individual module build.gradle files
1716 }
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ apply from: file('../gradle/signing.gradle')
2121
2222android {
2323 defaultConfig {
24- compileSdk 34
24+ compileSdk 35
2525 applicationId " com.damn.anotherglass.glass.ee"
2626 minSdkVersion 27
2727 // noinspection ExpiredTargetSdkVersion
@@ -67,9 +67,9 @@ dependencies {
6767 implementation project(' :glass-shared' )
6868 implementation project(' :glass-ee-gestures' )
6969 implementation ' androidx.recyclerview:recyclerview:1.3.2'
70- implementation ' androidx.constraintlayout:constraintlayout:2.1.4 '
70+ implementation ' androidx.constraintlayout:constraintlayout:2.2.0 '
7171 implementation ' com.google.android.material:material:1.12.0'
72- implementation ' androidx.core:core-ktx:1.13.1 '
72+ implementation ' androidx.core:core-ktx:1.15.0 '
7373
7474 implementation ' io.coil-kt:coil:2.6.0'
7575}
Original file line number Diff line number Diff line change @@ -5,9 +5,9 @@ plugins {
55
66android {
77 namespace ' com.damn.glass.shared'
8- compileSdk 29
98
109 defaultConfig {
10+ compileSdk 35
1111 minSdk 19
1212
1313 testInstrumentationRunner " androidx.test.runner.AndroidJUnitRunner"
@@ -21,15 +21,15 @@ android {
2121 }
2222 }
2323 compileOptions {
24- sourceCompatibility JavaVersion . VERSION_1_8
25- targetCompatibility JavaVersion . VERSION_1_8
24+ sourceCompatibility JavaVersion . VERSION_17
25+ targetCompatibility JavaVersion . VERSION_17
2626 }
2727 kotlinOptions {
28- jvmTarget = ' 1.8 '
28+ jvmTarget = JavaVersion . VERSION_17 . toString()
2929 }
3030}
3131
3232dependencies {
3333 implementation project(' :shared' )
34- implementation " androidx.annotation:annotation:1.7.1 "
34+ implementation ' androidx.annotation:annotation:1.9.1 '
3535}
Original file line number Diff line number Diff line change @@ -30,6 +30,7 @@ android {
3030 }
3131 }
3232
33+ // Later Java versions are not compatible with Glass GDK
3334 compileOptions {
3435 sourceCompatibility JavaVersion . VERSION_1_8
3536 targetCompatibility JavaVersion . VERSION_1_8
Original file line number Diff line number Diff line change @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33distributionPath =wrapper/dists
44zipStoreBase =GRADLE_USER_HOME
55zipStorePath =wrapper/dists
6- distributionUrl =https\://services.gradle.org/distributions/gradle-8.6 -all.zip
6+ distributionUrl =https\://services.gradle.org/distributions/gradle-8.9 -all.zip
Original file line number Diff line number Diff line change @@ -4,11 +4,12 @@ apply plugin: 'kotlin-android'
44apply from : file(' ../gradle/signing.gradle' )
55
66android {
7- compileSdk 34
87 defaultConfig {
9- applicationId " com.damn.anotherglass.phone "
8+ compileSdk 35
109 minSdkVersion 21
1110 targetSdkVersion 33
11+
12+ applicationId " com.damn.anotherglass.phone"
1213 versionCode 1
1314 versionName " 1.0"
1415 }
@@ -49,12 +50,12 @@ dependencies {
4950
5051 implementation fileTree(dir : ' libs' , include : [' *.jar' ])
5152
52- implementation ' androidx.appcompat:appcompat:1.6.1 '
53- implementation ' androidx.activity:activity-ktx:1.9.0 '
53+ implementation ' androidx.appcompat:appcompat:1.7.0 '
54+ implementation ' androidx.activity:activity-ktx:1.9.3 '
5455 implementation ' com.google.android.material:material:1.12.0'
5556
56- implementation ' androidx.constraintlayout:constraintlayout:2.1.4 '
57- implementation " org.jetbrains.kotlin:kotlin-stdlib-jdk7 :$kotlin_version "
57+ implementation ' androidx.constraintlayout:constraintlayout:2.2.0 '
58+ implementation " org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version "
5859
5960 implementation ' org.greenrobot:eventbus:3.3.1'
6061
Original file line number Diff line number Diff line change 11apply plugin : ' com.android.library'
22
33android {
4- compileSdkVersion 29
4+
55 defaultConfig {
6+ compileSdk 35
67 minSdkVersion 19
78 // noinspection ExpiredTargetSdkVersion
89 targetSdkVersion 29
@@ -18,5 +19,5 @@ android {
1819}
1920
2021dependencies {
21- implementation " androidx.annotation:annotation:1.7 .1"
22+ implementation " androidx.annotation:annotation:1.9 .1"
2223}
You can’t perform that action at this time.
0 commit comments