Skip to content

Commit 88d683f

Browse files
05nelsonm05nelsonm
committed
Rename all Builder classes to BuilderScope
1 parent 71ab30d commit 88d683f

File tree

17 files changed

+153
-154
lines changed

17 files changed

+153
-154
lines changed

‎library/runtime-core/api/runtime-core.api

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ public final class io/matthewnelson/kmp/tor/runtime/core/EnqueuedJob$ExecutionPo
8585
public fun toString ()Ljava/lang/String;
8686
}
8787

88-
public final class io/matthewnelson/kmp/tor/runtime/core/EnqueuedJob$ExecutionPolicy$Builder {
89-
public final fun cancellation (Lio/matthewnelson/kmp/tor/runtime/core/ThisBlock;)Lio/matthewnelson/kmp/tor/runtime/core/EnqueuedJob$ExecutionPolicy$Builder;
88+
public final class io/matthewnelson/kmp/tor/runtime/core/EnqueuedJob$ExecutionPolicy$BuilderScope {
89+
public final fun cancellation (Lio/matthewnelson/kmp/tor/runtime/core/ThisBlock;)Lio/matthewnelson/kmp/tor/runtime/core/EnqueuedJob$ExecutionPolicy$BuilderScope;
9090
}
9191

9292
public final class io/matthewnelson/kmp/tor/runtime/core/EnqueuedJob$ExecutionPolicy$Cancellation {
@@ -102,7 +102,7 @@ public final class io/matthewnelson/kmp/tor/runtime/core/EnqueuedJob$ExecutionPo
102102
public fun toString ()Ljava/lang/String;
103103
}
104104

105-
public final class io/matthewnelson/kmp/tor/runtime/core/EnqueuedJob$ExecutionPolicy$Cancellation$Builder {
105+
public final class io/matthewnelson/kmp/tor/runtime/core/EnqueuedJob$ExecutionPolicy$Cancellation$BuilderScope {
106106
public field accessibilityOpen Z
107107
public field allowAttempts Z
108108
public field substituteErrorWithAttempt Z

‎library/runtime-core/src/commonMain/kotlin/io/matthewnelson/kmp/tor/runtime/core/EnqueuedJob.kt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,8 @@ public abstract class EnqueuedJob protected constructor(
321321
* */
322322
@JvmStatic
323323
public fun Builder(
324-
block: ThisBlock<Builder>,
325-
): ExecutionPolicy = Builder.get().apply(block).build()
324+
block: ThisBlock<BuilderScope>,
325+
): ExecutionPolicy = BuilderScope.get().apply(block).build()
326326
}
327327

328328
/**
@@ -395,7 +395,7 @@ public abstract class EnqueuedJob protected constructor(
395395
}
396396

397397
@KmpTorDsl
398-
public class Builder private constructor() {
398+
public class BuilderScope private constructor() {
399399

400400
/**
401401
* Default: `false`
@@ -444,7 +444,8 @@ public abstract class EnqueuedJob protected constructor(
444444

445445
internal companion object {
446446
@JvmSynthetic
447-
internal fun get(): Builder = Builder()
447+
internal fun get(): BuilderScope =
448+
BuilderScope()
448449
}
449450
}
450451

@@ -462,14 +463,14 @@ public abstract class EnqueuedJob protected constructor(
462463
* @see [ExecutionPolicy.Companion.Builder]
463464
* */
464465
@KmpTorDsl
465-
public class Builder private constructor() {
466+
public class BuilderScope private constructor() {
466467

467-
private val _cancellation = Cancellation.Builder.get()
468+
private val _cancellation = Cancellation.BuilderScope.get()
468469

469470
@KmpTorDsl
470471
public fun cancellation(
471-
block: ThisBlock<Cancellation.Builder>,
472-
): Builder = apply { _cancellation.apply(block) }
472+
block: ThisBlock<Cancellation.BuilderScope>,
473+
): BuilderScope = apply { _cancellation.apply(block) }
473474

474475
@JvmSynthetic
475476
internal fun build(): ExecutionPolicy {
@@ -489,7 +490,7 @@ public abstract class EnqueuedJob protected constructor(
489490
internal companion object {
490491

491492
@JvmSynthetic
492-
internal fun get(): Builder = Builder()
493+
internal fun get(): BuilderScope = BuilderScope()
493494
}
494495
}
495496

‎library/runtime-service-ui/api/runtime-service-ui.api

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public final class io/matthewnelson/kmp/tor/runtime/service/ui/KmpTorServiceUI$C
5252
public final fun newConfig (Ljava/lang/Integer;Ljava/lang/Integer;Lio/matthewnelson/kmp/tor/runtime/core/ThisBlock;)Lio/matthewnelson/kmp/tor/runtime/service/ui/KmpTorServiceUI$Config;
5353
}
5454

55-
public final class io/matthewnelson/kmp/tor/runtime/service/ui/KmpTorServiceUI$Config$Builder {
55+
public final class io/matthewnelson/kmp/tor/runtime/service/ui/KmpTorServiceUI$Config$BuilderScope {
5656
public field colorReady I
5757
public field displayName Lio/matthewnelson/kmp/tor/runtime/service/ui/DisplayName;
5858
public field enableActionRestart Z
@@ -74,7 +74,7 @@ public final class io/matthewnelson/kmp/tor/runtime/service/ui/KmpTorServiceUI$F
7474
public fun validateConfig (Landroid/content/Context;Lio/matthewnelson/kmp/tor/runtime/service/ui/KmpTorServiceUI$Config;)V
7575
}
7676

77-
public final class io/matthewnelson/kmp/tor/runtime/service/ui/KmpTorServiceUI$Factory$Builder {
77+
public final class io/matthewnelson/kmp/tor/runtime/service/ui/KmpTorServiceUI$Factory$BuilderScope {
7878
public field actionIntentPermissionSuffix Ljava/lang/String;
7979
public field contentIntent Lkotlin/jvm/functions/Function2;
8080
public field contentIntentCode I
@@ -83,8 +83,8 @@ public final class io/matthewnelson/kmp/tor/runtime/service/ui/KmpTorServiceUI$F
8383
public field iconActionPrevious Ljava/lang/Integer;
8484
public field iconActionRestart Ljava/lang/Integer;
8585
public field iconActionStop Ljava/lang/Integer;
86-
public synthetic fun <init> (Lio/matthewnelson/kmp/tor/runtime/service/ui/KmpTorServiceUI$Config$Builder;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
87-
public final fun defaultConfig (Lio/matthewnelson/kmp/tor/runtime/core/ThisBlock;)Lio/matthewnelson/kmp/tor/runtime/service/ui/KmpTorServiceUI$Factory$Builder;
86+
public synthetic fun <init> (Lio/matthewnelson/kmp/tor/runtime/service/ui/KmpTorServiceUI$Config$BuilderScope;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
87+
public final fun defaultConfig (Lio/matthewnelson/kmp/tor/runtime/core/ThisBlock;)Lio/matthewnelson/kmp/tor/runtime/service/ui/KmpTorServiceUI$Factory$BuilderScope;
8888
}
8989

9090
public final class io/matthewnelson/kmp/tor/runtime/service/ui/KmpTorServiceUIInstanceState : io/matthewnelson/kmp/tor/runtime/service/AbstractTorServiceUI$InstanceState {

‎library/runtime-service-ui/src/androidMain/kotlin/io/matthewnelson/kmp/tor/runtime/service/ui/DisplayName.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import io.matthewnelson.kmp.tor.runtime.FileID
1919
import io.matthewnelson.kmp.tor.runtime.TorRuntime
2020

2121
/**
22-
* Configuration option types for [KmpTorServiceUI.Config.Builder.displayName].
22+
* Configuration option types for [KmpTorServiceUI.Config.BuilderScope.displayName].
2323
*
2424
* Will be shown below the selector action button icons
2525
* [R.drawable.ic_kmp_tor_ui_action_previous] and

0 commit comments

Comments
 (0)