Skip to content

Commit 1843675

Browse files
committed
fixup! chore: add scaffolding for android interop project
1 parent 2222f81 commit 1843675

File tree

6 files changed

+12
-28
lines changed

6 files changed

+12
-28
lines changed

crypto-ffi/bindings/gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ vanniktech-publish = "0.34.0"
1414
kotlin-gradle = "1.9.21"
1515
dokka = "2.0.0"
1616
detekt = "1.23.8"
17-
agp = "8.12.1"
17+
agp = "8.12.3"
1818

1919
[plugins]
2020
android-library = { id = "com.android.library", version.ref = "agp" }

interop/src/clients/android-interop/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ android {
2525
}
2626
}
2727
compileOptions {
28-
sourceCompatibility = JavaVersion.VERSION_11
29-
targetCompatibility = JavaVersion.VERSION_11
28+
sourceCompatibility = JavaVersion.VERSION_17
29+
targetCompatibility = JavaVersion.VERSION_17
3030
}
3131
kotlin {
3232
compilerOptions {
33-
jvmTarget.set(JvmTarget.JVM_11)
33+
jvmTarget.set(JvmTarget.JVM_17)
3434
}
3535
}
3636
}

interop/src/clients/android-interop/src/main/AndroidManifest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
33

4-
<application
5-
android:allowBackup="false"
6-
android:supportsRtl="true">
4+
<application>
75
<activity
86
android:name=".MainActivity"
97
android:launchMode="singleTop"

interop/src/clients/gradle.properties

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,3 @@ android.useAndroidX=true
99

1010
# Automatically convert third-party libraries to use AndroidX
1111
android.enableJetifier=true
12-
13-
# Kotlin code style for this project: "official" or "obsolete":
14-
kotlin.code.style=official
15-
16-
# Enables namespacing of each library's R class so that its R class includes only the
17-
# resources declared in the library itself and none from the library's dependencies,
18-
# thereby reducing the size of the R class for that library
19-
android.nonTransitiveRClass=true

interop/src/clients/gradle/libs.versions.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[versions]
2-
kotlin = "2.0.21"
3-
coroutines = "1.7.3"
4-
android-tools = "8.12.1"
2+
kotlin = "2.3.0"
3+
coroutines = "1.10.2"
4+
android-tools = "8.12.3"
55
kotlin-gradle = "1.9.21"
6-
agp = "8.12.1"
7-
ktx-serialization = "1.8.1"
8-
activity = "1.8.0"
6+
agp = "8.12.3"
7+
ktx-serialization = "1.9.0"
8+
activity = "1.12.2"
99

1010
[plugins]
1111
android-application = { id = "com.android.application", version.ref = "agp" }

interop/src/clients/settings.gradle.kts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,7 @@ rootProject.name = "interop"
22

33
pluginManagement {
44
repositories {
5-
google {
6-
content {
7-
includeGroupByRegex("com\\.android.*")
8-
includeGroupByRegex("com\\.google.*")
9-
includeGroupByRegex("androidx.*")
10-
}
11-
}
5+
google()
126
mavenCentral()
137
gradlePluginPortal()
148
}

0 commit comments

Comments
 (0)