Skip to content

Commit cf2d101

Browse files
committed
update agp version
1 parent cb11aa9 commit cf2d101

File tree

14 files changed

+42
-81
lines changed

14 files changed

+42
-81
lines changed

app/build.gradle.kts

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
22
alias(libs.plugins.android.application)
3-
alias(libs.plugins.jetbrains.kotlin)
43
}
54

65
android {
@@ -18,21 +17,18 @@ android {
1817
buildTypes {
1918
release {
2019
isMinifyEnabled = false
21-
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
20+
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
2221
}
2322
}
24-
compileOptions {
25-
sourceCompatibility = JavaVersion.VERSION_17
26-
targetCompatibility = JavaVersion.VERSION_17
27-
}
28-
kotlin {
29-
jvmToolchain(17)
30-
}
3123
buildFeatures {
3224
buildConfig = true
3325
}
3426
}
3527

28+
kotlin {
29+
jvmToolchain(17)
30+
}
31+
3632
dependencies {
3733
implementation(project(":library"))
3834
implementation(project(":extra-sources"))

common/build.gradle.kts

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
22
alias(libs.plugins.android.library)
3-
alias(libs.plugins.jetbrains.kotlin)
43
alias(libs.plugins.jetbrains.dokka)
54
`maven-publish`
65
}
@@ -13,24 +12,20 @@ android {
1312
minSdk = 16
1413
lint.targetSdk = 36
1514
}
16-
1715
buildTypes {
1816
release {
1917
isMinifyEnabled = false
2018
}
2119
}
22-
compileOptions {
23-
sourceCompatibility = JavaVersion.VERSION_17
24-
targetCompatibility = JavaVersion.VERSION_17
25-
}
26-
kotlin {
27-
jvmToolchain(17)
28-
}
2920
publishing {
3021
singleVariant("release")
3122
}
3223
}
3324

25+
kotlin {
26+
jvmToolchain(17)
27+
}
28+
3429
afterEvaluate {
3530
publishing {
3631
publications {

common/src/main/java/com/pedro/common/socket/ktor/TcpStreamSocketKtorBase.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import io.ktor.network.sockets.openWriteChannel
99
import io.ktor.utils.io.ByteReadChannel
1010
import io.ktor.utils.io.ByteWriteChannel
1111
import io.ktor.utils.io.readFully
12-
import io.ktor.utils.io.readUTF8Line
12+
import io.ktor.utils.io.readLine
1313
import io.ktor.utils.io.writeByte
1414
import io.ktor.utils.io.writeFully
1515
import kotlinx.coroutines.Dispatchers
@@ -77,7 +77,7 @@ abstract class TcpStreamSocketKtorBase(
7777
return data
7878
}
7979

80-
override suspend fun readLine(): String? = input?.readUTF8Line()
80+
override suspend fun readLine(): String? = input?.readLine()
8181

8282
override fun isConnected(): Boolean = socket?.isClosed != true
8383

encoder/build.gradle.kts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
22
alias(libs.plugins.android.library)
3-
alias(libs.plugins.jetbrains.kotlin)
43
alias(libs.plugins.jetbrains.dokka)
54
`maven-publish`
65
}
@@ -18,13 +17,6 @@ android {
1817
isMinifyEnabled = false
1918
}
2019
}
21-
compileOptions {
22-
sourceCompatibility = JavaVersion.VERSION_17
23-
targetCompatibility = JavaVersion.VERSION_17
24-
}
25-
kotlin {
26-
jvmToolchain(17)
27-
}
2820
buildFeatures {
2921
buildConfig = true
3022
}
@@ -33,6 +25,10 @@ android {
3325
}
3426
}
3527

28+
kotlin {
29+
jvmToolchain(17)
30+
}
31+
3632
afterEvaluate {
3733
publishing {
3834
publications {

extra-sources/build.gradle.kts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
22
alias(libs.plugins.android.library)
3-
alias(libs.plugins.jetbrains.kotlin)
43
alias(libs.plugins.jetbrains.dokka)
54
`maven-publish`
65
}
@@ -18,18 +17,15 @@ android {
1817
isMinifyEnabled = false
1918
}
2019
}
21-
compileOptions {
22-
sourceCompatibility = JavaVersion.VERSION_17
23-
targetCompatibility = JavaVersion.VERSION_17
24-
}
25-
kotlin {
26-
jvmToolchain(17)
27-
}
2820
publishing {
2921
singleVariant("release")
3022
}
3123
}
3224

25+
kotlin {
26+
jvmToolchain(17)
27+
}
28+
3329
afterEvaluate {
3430
publishing {
3531
publications {

extra-sources/src/main/java/com/pedro/extrasources/CameraXSource.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class CameraXSource(
7070
private var fingerSpacing = 0f
7171
private var requiredSize: Size? = null
7272

73-
override val lifecycle: Lifecycle = lifecycleRegistry
73+
override fun getLifecycle(): Lifecycle = lifecycleRegistry
7474

7575
override fun create(width: Int, height: Int, fps: Int, rotation: Int): Boolean {
7676
val facing = if (facing == CameraSelector.LENS_FACING_BACK) CameraHelper.Facing.BACK else CameraHelper.Facing.FRONT

gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
android.enableJetifier=true
21
android.useAndroidX=true
32
org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m
43
org.gradle.java.installations.auto-download=true

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
#plugins versions
3-
agp = "8.13.2"
3+
agp = "9.1.0"
44
kotlin = "2.3.20"
55
dokka = "2.2.0"
66

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Thu Jun 26 11:05:20 CEST 2025
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

library/build.gradle.kts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
22
alias(libs.plugins.android.library)
3-
alias(libs.plugins.jetbrains.kotlin)
43
alias(libs.plugins.jetbrains.dokka)
54
`maven-publish`
65
}
@@ -18,18 +17,15 @@ android {
1817
isMinifyEnabled = false
1918
}
2019
}
21-
compileOptions {
22-
sourceCompatibility = JavaVersion.VERSION_17
23-
targetCompatibility = JavaVersion.VERSION_17
24-
}
25-
kotlin {
26-
jvmToolchain(17)
27-
}
2820
publishing {
2921
singleVariant("release")
3022
}
3123
}
3224

25+
kotlin {
26+
jvmToolchain(17)
27+
}
28+
3329
afterEvaluate {
3430
publishing {
3531
publications {

0 commit comments

Comments
 (0)