diff --git a/Android.bp b/Android.bp index 028ca46..1e4391a 100644 --- a/Android.bp +++ b/Android.bp @@ -26,8 +26,8 @@ java_library_static { ], static_libs: [ "OpenEUICC_androidx.datastore_datastore-core-nodeps", - "OpenEUICC_org.jetbrains.kotlin_kotlin-stdlib", - "OpenEUICC_org.jetbrains.kotlinx_kotlinx-coroutines-core-jvm", + "kotlin-stdlib", + "kotlinx-coroutines-core-jvm", ], java_version: "1.7", } @@ -53,7 +53,7 @@ java_library_static { ], static_libs: [ "OpenEUICC_androidx.datastore_datastore-preferences-core-nodeps", - "OpenEUICC_org.jetbrains.kotlin_kotlin-stdlib", + "kotlin-stdlib", "OpenEUICC_androidx.datastore_datastore-core", ], java_version: "1.7", @@ -69,7 +69,7 @@ android_library_import { "//apex_available:anyapex", ], static_libs: [ - "OpenEUICC_org.jetbrains.kotlin_kotlin-stdlib", + "kotlin-stdlib", "OpenEUICC_androidx.datastore_datastore", "OpenEUICC_androidx.datastore_datastore-preferences-core", ], @@ -86,7 +86,7 @@ android_library { manifest: "androidx/datastore/datastore-preferences/1.0.0/AndroidManifest.xml", static_libs: [ "OpenEUICC_androidx.datastore_datastore-preferences-nodeps", - "OpenEUICC_org.jetbrains.kotlin_kotlin-stdlib", + "kotlin-stdlib", "OpenEUICC_androidx.datastore_datastore", "OpenEUICC_androidx.datastore_datastore-preferences-core", ], @@ -103,7 +103,7 @@ android_library_import { "//apex_available:anyapex", ], static_libs: [ - "OpenEUICC_org.jetbrains.kotlin_kotlin-stdlib", + "kotlin-stdlib", "OpenEUICC_androidx.datastore_datastore-core", ], } @@ -119,7 +119,7 @@ android_library { manifest: "androidx/datastore/datastore/1.0.0/AndroidManifest.xml", static_libs: [ "OpenEUICC_androidx.datastore_datastore-nodeps", - "OpenEUICC_org.jetbrains.kotlin_kotlin-stdlib", + "kotlin-stdlib", "OpenEUICC_androidx.datastore_datastore-core", ], java_version: "1.7", @@ -229,160 +229,3 @@ android_library { ], java_version: "1.7", } - -java_import { - name: "OpenEUICC_org.jetbrains.kotlin_kotlin-stdlib-jdk7-nodeps", - jars: ["org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22.jar"], - sdk_version: "33", - min_sdk_version: "14", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], -} - -java_library_static { - name: "OpenEUICC_org.jetbrains.kotlin_kotlin-stdlib-jdk7", - sdk_version: "33", - min_sdk_version: "14", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - static_libs: [ - "OpenEUICC_org.jetbrains.kotlin_kotlin-stdlib-jdk7-nodeps", - "OpenEUICC_org.jetbrains.kotlin_kotlin-stdlib", - ], - java_version: "1.7", -} - -java_import { - name: "OpenEUICC_org.jetbrains.kotlin_kotlin-stdlib-jdk8-nodeps", - jars: ["org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22.jar"], - sdk_version: "33", - min_sdk_version: "14", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], -} - -java_library_static { - name: "OpenEUICC_org.jetbrains.kotlin_kotlin-stdlib-jdk8", - sdk_version: "33", - min_sdk_version: "14", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - static_libs: [ - "OpenEUICC_org.jetbrains.kotlin_kotlin-stdlib-jdk8-nodeps", - "OpenEUICC_org.jetbrains.kotlin_kotlin-stdlib", - "OpenEUICC_org.jetbrains.kotlin_kotlin-stdlib-jdk7", - ], - java_version: "1.7", -} - -java_import { - name: "OpenEUICC_org.jetbrains.kotlin_kotlin-stdlib-nodeps", - jars: ["org/jetbrains/kotlin/kotlin-stdlib/1.9.20/kotlin-stdlib-1.9.20.jar"], - sdk_version: "33", - min_sdk_version: "14", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], -} - -java_library_static { - name: "OpenEUICC_org.jetbrains.kotlin_kotlin-stdlib", - sdk_version: "33", - min_sdk_version: "14", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - static_libs: [ - "OpenEUICC_org.jetbrains.kotlin_kotlin-stdlib-nodeps", - "OpenEUICC_org.jetbrains_annotations", - ], - java_version: "1.7", -} - -java_import { - name: "OpenEUICC_org.jetbrains.kotlinx_kotlinx-coroutines-android-nodeps", - jars: ["org/jetbrains/kotlinx/kotlinx-coroutines-android/1.6.4/kotlinx-coroutines-android-1.6.4.jar"], - sdk_version: "33", - min_sdk_version: "14", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], -} - -java_library_static { - name: "OpenEUICC_org.jetbrains.kotlinx_kotlinx-coroutines-android", - sdk_version: "33", - min_sdk_version: "14", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - static_libs: [ - "OpenEUICC_org.jetbrains.kotlinx_kotlinx-coroutines-android-nodeps", - "OpenEUICC_org.jetbrains.kotlinx_kotlinx-coroutines-core-jvm", - "OpenEUICC_org.jetbrains.kotlin_kotlin-stdlib-jdk8", - ], - java_version: "1.7", -} - -java_import { - name: "OpenEUICC_org.jetbrains.kotlinx_kotlinx-coroutines-core-jvm-nodeps", - jars: ["org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.6.4/kotlinx-coroutines-core-jvm-1.6.4.jar"], - sdk_version: "33", - min_sdk_version: "14", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], -} - -java_library_static { - name: "OpenEUICC_org.jetbrains.kotlinx_kotlinx-coroutines-core-jvm", - sdk_version: "33", - min_sdk_version: "14", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - static_libs: [ - "OpenEUICC_org.jetbrains.kotlinx_kotlinx-coroutines-core-jvm-nodeps", - "OpenEUICC_org.jetbrains.kotlin_kotlin-stdlib-jdk8", - ], - java_version: "1.7", -} - -java_import { - name: "OpenEUICC_org.jetbrains_annotations-nodeps", - jars: ["org/jetbrains/annotations/13.0/annotations-13.0.jar"], - sdk_version: "33", - min_sdk_version: "14", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], -} - -java_library_static { - name: "OpenEUICC_org.jetbrains_annotations", - sdk_version: "33", - min_sdk_version: "14", - apex_available: [ - "//apex_available:platform", - "//apex_available:anyapex", - ], - static_libs: [ - "OpenEUICC_org.jetbrains_annotations-nodeps", - ], - java_version: "1.7", -} diff --git a/org/jetbrains/annotations/13.0/annotations-13.0.jar b/org/jetbrains/annotations/13.0/annotations-13.0.jar deleted file mode 100644 index fb794be..0000000 Binary files a/org/jetbrains/annotations/13.0/annotations-13.0.jar and /dev/null differ diff --git a/org/jetbrains/annotations/13.0/annotations-13.0.jar.license b/org/jetbrains/annotations/13.0/annotations-13.0.jar.license deleted file mode 100644 index be57da9..0000000 --- a/org/jetbrains/annotations/13.0/annotations-13.0.jar.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2024 JetBrains Team - -SPDX-License-Identifier: Apache-2.0 diff --git a/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22.jar b/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22.jar deleted file mode 100644 index 30ca1d1..0000000 Binary files a/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22.jar and /dev/null differ diff --git a/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22.jar.license b/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22.jar.license deleted file mode 100644 index 05b4421..0000000 --- a/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.8.22/kotlin-stdlib-jdk7-1.8.22.jar.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2024 Kotlin Team - -SPDX-License-Identifier: Apache-2.0 diff --git a/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22.jar b/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22.jar deleted file mode 100644 index b6609af..0000000 Binary files a/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22.jar and /dev/null differ diff --git a/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22.jar.license b/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22.jar.license deleted file mode 100644 index 05b4421..0000000 --- a/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.8.22/kotlin-stdlib-jdk8-1.8.22.jar.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2024 Kotlin Team - -SPDX-License-Identifier: Apache-2.0 diff --git a/org/jetbrains/kotlin/kotlin-stdlib/1.9.20/kotlin-stdlib-1.9.20.jar b/org/jetbrains/kotlin/kotlin-stdlib/1.9.20/kotlin-stdlib-1.9.20.jar deleted file mode 100644 index 9140355..0000000 Binary files a/org/jetbrains/kotlin/kotlin-stdlib/1.9.20/kotlin-stdlib-1.9.20.jar and /dev/null differ diff --git a/org/jetbrains/kotlin/kotlin-stdlib/1.9.20/kotlin-stdlib-1.9.20.jar.license b/org/jetbrains/kotlin/kotlin-stdlib/1.9.20/kotlin-stdlib-1.9.20.jar.license deleted file mode 100644 index 05b4421..0000000 --- a/org/jetbrains/kotlin/kotlin-stdlib/1.9.20/kotlin-stdlib-1.9.20.jar.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2024 Kotlin Team - -SPDX-License-Identifier: Apache-2.0 diff --git a/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.6.4/kotlinx-coroutines-android-1.6.4.jar b/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.6.4/kotlinx-coroutines-android-1.6.4.jar deleted file mode 100644 index 6ec2aba..0000000 Binary files a/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.6.4/kotlinx-coroutines-android-1.6.4.jar and /dev/null differ diff --git a/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.6.4/kotlinx-coroutines-android-1.6.4.jar.license b/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.6.4/kotlinx-coroutines-android-1.6.4.jar.license deleted file mode 100644 index be57da9..0000000 --- a/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.6.4/kotlinx-coroutines-android-1.6.4.jar.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2024 JetBrains Team - -SPDX-License-Identifier: Apache-2.0 diff --git a/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.6.4/kotlinx-coroutines-core-jvm-1.6.4.jar b/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.6.4/kotlinx-coroutines-core-jvm-1.6.4.jar deleted file mode 100644 index fb7d7d9..0000000 Binary files a/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.6.4/kotlinx-coroutines-core-jvm-1.6.4.jar and /dev/null differ diff --git a/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.6.4/kotlinx-coroutines-core-jvm-1.6.4.jar.license b/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.6.4/kotlinx-coroutines-core-jvm-1.6.4.jar.license deleted file mode 100644 index be57da9..0000000 --- a/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.6.4/kotlinx-coroutines-core-jvm-1.6.4.jar.license +++ /dev/null @@ -1,3 +0,0 @@ -SPDX-FileCopyrightText: 2024 JetBrains Team - -SPDX-License-Identifier: Apache-2.0