Skip to content

Commit e843a55

Browse files
serrasserras
authored
Move to in-repo convention plug-in (#3567)
1 parent 994815b commit e843a55

File tree

80 files changed

+4071
-310
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+4071
-310
lines changed

‎arrow-libs/core/arrow-annotations/api/arrow-annotations.api renamed to ‎arrow-libs/core/arrow-annotations/api/android/arrow-annotations.api

File renamed without changes.

‎arrow-libs/core/arrow-annotations/api/jvm/arrow-annotations.api

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
public final class arrow/optics/OpticsTarget : java/lang/Enum {
2+
public static final field DSL Larrow/optics/OpticsTarget;
3+
public static final field ISO Larrow/optics/OpticsTarget;
4+
public static final field LENS Larrow/optics/OpticsTarget;
5+
public static final field OPTIONAL Larrow/optics/OpticsTarget;
6+
public static final field PRISM Larrow/optics/OpticsTarget;
7+
public static fun getEntries ()Lkotlin/enums/EnumEntries;
8+
public static fun valueOf (Ljava/lang/String;)Larrow/optics/OpticsTarget;
9+
public static fun values ()[Larrow/optics/OpticsTarget;
10+
}
11+
12+
public abstract interface annotation class arrow/optics/optics : java/lang/annotation/Annotation {
13+
public abstract fun targets ()[Larrow/optics/OpticsTarget;
14+
}
15+
16+
public abstract interface annotation class arrow/synthetic : java/lang/annotation/Annotation {
17+
}
18+

‎arrow-libs/core/arrow-annotations/build.gradle.kts

+6-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
@file:Suppress("DSL_SCOPE_VIOLATION")
22

3-
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
4-
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
5-
6-
73
plugins {
84
id(libs.plugins.kotlin.multiplatform.get().pluginId)
9-
alias(libs.plugins.arrowGradleConfig.kotlin)
5+
id(libs.plugins.android.library.get().pluginId)
6+
id("arrow.kotlin")
107
alias(libs.plugins.publish)
118
alias(libs.plugins.spotless)
129
alias(libs.plugins.dokka)
@@ -36,10 +33,9 @@ kotlin {
3633
}
3734
}
3835
}
36+
}
3937

40-
@OptIn(ExperimentalKotlinGradlePluginApi::class)
41-
compilerOptions {
42-
(project.rootProject.properties["kotlin_language_version"] as? String)?.also { languageVersion = KotlinVersion.fromVersion(it) }
43-
(project.rootProject.properties["kotlin_api_version"] as? String)?.also { apiVersion = KotlinVersion.fromVersion(it) }
44-
}
38+
android {
39+
namespace = "arrow.annotations"
40+
compileSdk = libs.versions.android.compileSdk.get().toInt()
4541
}

‎arrow-libs/core/arrow-atomic/api/arrow-atomic.api renamed to ‎arrow-libs/core/arrow-atomic/api/android/arrow-atomic.api

File renamed without changes.

‎arrow-libs/core/arrow-atomic/api/jvm/arrow-atomic.api

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
public final class arrow/atomic/AtomicBoolean {
2+
public fun <init> (Z)V
3+
public final fun compareAndSet (ZZ)Z
4+
public final fun get ()Z
5+
public final fun getAndSet (Z)Z
6+
public final fun getValue ()Z
7+
public final fun set (Z)V
8+
public final fun setValue (Z)V
9+
}
10+
11+
public final class arrow/atomic/AtomicBooleanKt {
12+
public static final fun getAndUpdate (Larrow/atomic/AtomicBoolean;Lkotlin/jvm/functions/Function1;)Z
13+
public static final fun loop (Larrow/atomic/AtomicBoolean;Lkotlin/jvm/functions/Function1;)Ljava/lang/Void;
14+
public static final fun tryUpdate (Larrow/atomic/AtomicBoolean;Lkotlin/jvm/functions/Function1;)Z
15+
public static final fun tryUpdate (Larrow/atomic/AtomicBoolean;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Z
16+
public static final fun update (Larrow/atomic/AtomicBoolean;Lkotlin/jvm/functions/Function1;)V
17+
public static final fun update (Larrow/atomic/AtomicBoolean;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
18+
public static final fun updateAndGet (Larrow/atomic/AtomicBoolean;Lkotlin/jvm/functions/Function1;)Z
19+
}
20+
21+
public final class arrow/atomic/AtomicIntKt {
22+
public static final fun getAndUpdate (Ljava/util/concurrent/atomic/AtomicInteger;Lkotlin/jvm/functions/Function1;)I
23+
public static final fun getValue (Ljava/util/concurrent/atomic/AtomicInteger;)I
24+
public static final fun loop (Ljava/util/concurrent/atomic/AtomicInteger;Lkotlin/jvm/functions/Function1;)Ljava/lang/Void;
25+
public static final fun setValue (Ljava/util/concurrent/atomic/AtomicInteger;I)V
26+
public static final fun tryUpdate (Ljava/util/concurrent/atomic/AtomicInteger;Lkotlin/jvm/functions/Function1;)Z
27+
public static final fun tryUpdate (Ljava/util/concurrent/atomic/AtomicInteger;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Z
28+
public static final fun update (Ljava/util/concurrent/atomic/AtomicInteger;Lkotlin/jvm/functions/Function1;)V
29+
public static final fun update (Ljava/util/concurrent/atomic/AtomicInteger;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
30+
public static final fun updateAndGet (Ljava/util/concurrent/atomic/AtomicInteger;Lkotlin/jvm/functions/Function1;)I
31+
}
32+
33+
public final class arrow/atomic/AtomicKt {
34+
public static final fun getAndUpdate (Ljava/util/concurrent/atomic/AtomicReference;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
35+
public static final fun getValue (Ljava/util/concurrent/atomic/AtomicReference;)Ljava/lang/Object;
36+
public static final fun loop (Ljava/util/concurrent/atomic/AtomicReference;Lkotlin/jvm/functions/Function1;)Ljava/lang/Void;
37+
public static final fun setValue (Ljava/util/concurrent/atomic/AtomicReference;Ljava/lang/Object;)V
38+
public static final fun tryUpdate (Ljava/util/concurrent/atomic/AtomicReference;Lkotlin/jvm/functions/Function1;)Z
39+
public static final fun tryUpdate (Ljava/util/concurrent/atomic/AtomicReference;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Z
40+
public static final fun update (Ljava/util/concurrent/atomic/AtomicReference;Lkotlin/jvm/functions/Function1;)V
41+
public static final fun update (Ljava/util/concurrent/atomic/AtomicReference;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
42+
public static final fun updateAndGet (Ljava/util/concurrent/atomic/AtomicReference;Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
43+
}
44+
45+
public final class arrow/atomic/AtomicLongKt {
46+
public static final fun getAndUpdate (Ljava/util/concurrent/atomic/AtomicLong;Lkotlin/jvm/functions/Function1;)J
47+
public static final fun getValue (Ljava/util/concurrent/atomic/AtomicLong;)J
48+
public static final fun loop (Ljava/util/concurrent/atomic/AtomicLong;Lkotlin/jvm/functions/Function1;)Ljava/lang/Void;
49+
public static final fun setValue (Ljava/util/concurrent/atomic/AtomicLong;J)V
50+
public static final fun tryUpdate (Ljava/util/concurrent/atomic/AtomicLong;Lkotlin/jvm/functions/Function1;)Z
51+
public static final fun tryUpdate (Ljava/util/concurrent/atomic/AtomicLong;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Z
52+
public static final fun update (Ljava/util/concurrent/atomic/AtomicLong;Lkotlin/jvm/functions/Function1;)V
53+
public static final fun update (Ljava/util/concurrent/atomic/AtomicLong;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
54+
public static final fun updateAndGet (Ljava/util/concurrent/atomic/AtomicLong;Lkotlin/jvm/functions/Function1;)J
55+
}
56+

‎arrow-libs/core/arrow-atomic/build.gradle.kts

+5-11
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
@file:Suppress("DSL_SCOPE_VIOLATION")
22

33
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
4-
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
5-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
64

75
plugins {
86
id(libs.plugins.kotlin.multiplatform.get().pluginId)
9-
alias(libs.plugins.arrowGradleConfig.kotlin)
7+
id(libs.plugins.android.library.get().pluginId)
8+
id("arrow.kotlin")
109
alias(libs.plugins.publish)
1110
alias(libs.plugins.kotlinx.kover)
1211
alias(libs.plugins.spotless)
@@ -51,14 +50,9 @@ kotlin {
5150
}
5251
}
5352
}
54-
55-
@OptIn(ExperimentalKotlinGradlePluginApi::class)
56-
compilerOptions {
57-
(project.rootProject.properties["kotlin_language_version"] as? String)?.also { languageVersion = KotlinVersion.fromVersion(it) }
58-
(project.rootProject.properties["kotlin_api_version"] as? String)?.also { apiVersion = KotlinVersion.fromVersion(it) }
59-
}
6053
}
6154

62-
tasks.withType<Test>().configureEach {
63-
useJUnitPlatform()
55+
android {
56+
namespace = "arrow.atomic"
57+
compileSdk = libs.versions.android.compileSdk.get().toInt()
6458
}

‎arrow-libs/core/arrow-atomic/src/jvmMain/kotlin/arrow/atomic/Atomic.kt renamed to ‎arrow-libs/core/arrow-atomic/src/androidAndJvmMain/kotlin/arrow/atomic/Atomic.kt

File renamed without changes.

‎arrow-libs/core/arrow-atomic/src/jvmMain/kotlin/arrow/atomic/AtomicInt.kt renamed to ‎arrow-libs/core/arrow-atomic/src/androidAndJvmMain/kotlin/arrow/atomic/AtomicInt.kt

File renamed without changes.

‎arrow-libs/core/arrow-atomic/src/jvmMain/kotlin/arrow/atomic/AtomicLong.kt renamed to ‎arrow-libs/core/arrow-atomic/src/androidAndJvmMain/kotlin/arrow/atomic/AtomicLong.kt

File renamed without changes.

‎arrow-libs/core/arrow-autoclose/api/arrow-autoclose.api renamed to ‎arrow-libs/core/arrow-autoclose/api/android/arrow-autoclose.api

File renamed without changes.

‎arrow-libs/core/arrow-autoclose/api/jvm/arrow-autoclose.api

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
public abstract interface class arrow/AutoCloseScope {
2+
public abstract fun autoClose (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
3+
public abstract fun install (Ljava/lang/AutoCloseable;)Ljava/lang/AutoCloseable;
4+
public abstract fun onClose (Lkotlin/jvm/functions/Function1;)V
5+
}
6+
7+
public final class arrow/AutoCloseScope$DefaultImpls {
8+
public static fun autoClose (Larrow/AutoCloseScope;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
9+
public static fun install (Larrow/AutoCloseScope;Ljava/lang/AutoCloseable;)Ljava/lang/AutoCloseable;
10+
}
11+
12+
public final class arrow/AutoCloseScopeKt {
13+
public static final fun autoCloseScope (Lkotlin/jvm/functions/Function1;)Ljava/lang/Object;
14+
}
15+
16+
public final class arrow/DefaultAutoCloseScope : arrow/AutoCloseScope {
17+
public fun <init> ()V
18+
public fun autoClose (Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function2;)Ljava/lang/Object;
19+
public final fun close (Ljava/lang/Throwable;)Ljava/lang/Void;
20+
public fun install (Ljava/lang/AutoCloseable;)Ljava/lang/AutoCloseable;
21+
public fun onClose (Lkotlin/jvm/functions/Function1;)V
22+
}
23+
24+
public final class arrow/ThrowIfFatalKt {
25+
public static final fun throwIfFatal (Ljava/lang/Throwable;)Ljava/lang/Throwable;
26+
}
27+

‎arrow-libs/core/arrow-autoclose/build.gradle.kts

+6-11
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
@file:Suppress("DSL_SCOPE_VIOLATION")
22

3-
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
4-
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
5-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
6-
7-
83
plugins {
94
id(libs.plugins.kotlin.multiplatform.get().pluginId)
10-
alias(libs.plugins.arrowGradleConfig.kotlin)
5+
id(libs.plugins.android.library.get().pluginId)
6+
id("arrow.kotlin")
117
alias(libs.plugins.publish)
128
alias(libs.plugins.kotlinx.kover)
139
alias(libs.plugins.spotless)
@@ -46,10 +42,9 @@ kotlin {
4642
}
4743
}
4844
}
45+
}
4946

50-
@OptIn(ExperimentalKotlinGradlePluginApi::class)
51-
compilerOptions {
52-
(project.rootProject.properties["kotlin_language_version"] as? String)?.also { languageVersion = KotlinVersion.fromVersion(it) }
53-
(project.rootProject.properties["kotlin_api_version"] as? String)?.also { apiVersion = KotlinVersion.fromVersion(it) }
54-
}
47+
android {
48+
namespace = "arrow.autoclose"
49+
compileSdk = libs.versions.android.compileSdk.get().toInt()
5550
}

‎arrow-libs/core/arrow-autoclose/src/jvmMain/kotlin/arrow/throwIfFatal.kt renamed to ‎arrow-libs/core/arrow-autoclose/src/androidAndJvmMain/kotlin/arrow/throwIfFatal.kt

File renamed without changes.

‎arrow-libs/core/arrow-cache4k/api/arrow-cache4k.klib.api

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Klib ABI Dump
2-
// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, watchosArm64, watchosSimulatorArm64, watchosX64]
2+
// Targets: [iosArm64, iosSimulatorArm64, iosX64, js, linuxArm64, linuxX64, macosArm64, macosX64, mingwX64, tvosArm64, tvosSimulatorArm64, tvosX64, wasmJs, watchosArm64, watchosSimulatorArm64, watchosX64]
33
// Rendering settings:
44
// - Signature version: 2
55
// - Show manifest properties: true

‎arrow-libs/core/arrow-cache4k/build.gradle.kts

+6-11
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22

33
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
44
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
5-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
6-
75

86
plugins {
9-
// `java-library`
107
id(libs.plugins.kotlin.multiplatform.get().pluginId)
118
alias(libs.plugins.publish)
129
alias(libs.plugins.kotlinx.kover)
@@ -41,18 +38,16 @@ kotlin {
4138
}
4239
}
4340

44-
jvm {
45-
withJava()
46-
}
41+
jvm()
4742
js(IR) {
4843
browser()
4944
nodejs()
5045
}
51-
// @OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class) wasmJs {
52-
// browser()
53-
// nodejs()
54-
// d8()
55-
// }
46+
@OptIn(org.jetbrains.kotlin.gradle.ExperimentalWasmDsl::class) wasmJs {
47+
browser()
48+
nodejs()
49+
d8()
50+
}
5651
// Native: https://kotlinlang.org/docs/native-target-support.html
5752
// -- Tier 1 --
5853
linuxX64()

‎arrow-libs/core/arrow-core-high-arity/api/arrow-core-high-arity.api renamed to ‎arrow-libs/core/arrow-core-high-arity/api/android/arrow-core-high-arity.api

File renamed without changes.

0 commit comments

Comments
 (0)