mirror of
https://github.com/nolen777/eagle0.git
synced 2026-07-28 21:35:42 +00:00
Remove stale proto exports from province:province (#5478)
* Remove stale proto exports from province:province The province target was exporting province_event_scala_proto, army_scala_proto, and unaffiliated_hero_scala_proto but no downstream targets actually needed these through that path. Removing these stale exports reduces library/ proto deps from 41 to 26. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Fix unused import and stale test dependency Remove unused LlmRequestT import and stale unaffiliated_hero_scala_proto dependency that were exposed by removing the province proto exports. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * Fix test build failures from stale proto dependencies - Remove unused ProtoMatchers from tests that don't use it - Add missing unaffiliated_hero_quest_scala_proto dep to quest_fulfillment_utils_test - Remove stale unaffiliated_hero_quest_scala_proto dep from check_for_fulfilled_quests_action_test - Keep ProtoMatchers in ResolveBattleActionTest (uses equalProto matcher) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -1,3 +1,3 @@
|
||||
# BUILD dependency baseline - updated Tue Jan 20 21:22:24 PST 2026
|
||||
# Do not increase these numbers - only decrease!
|
||||
library_proto_deps=41
|
||||
library_proto_deps=26
|
||||
|
||||
@@ -39,9 +39,6 @@ scala_library(
|
||||
":event",
|
||||
":incoming_end_turn_action",
|
||||
":orders",
|
||||
"//src/main/protobuf/net/eagle0/eagle/common:province_event_scala_proto",
|
||||
"//src/main/protobuf/net/eagle0/eagle/internal:army_scala_proto",
|
||||
"//src/main/protobuf/net/eagle0/eagle/internal:unaffiliated_hero_scala_proto",
|
||||
"//src/main/scala/net/eagle0/eagle/model/state:army",
|
||||
"//src/main/scala/net/eagle0/eagle/model/state:battalion_type_id",
|
||||
"//src/main/scala/net/eagle0/eagle/model/state:battle_revelation",
|
||||
|
||||
@@ -49,7 +49,6 @@ scala_test(
|
||||
name = "check_for_fulfilled_quests_action_test",
|
||||
srcs = ["CheckForFulfilledQuestsActionTest.scala"],
|
||||
deps = [
|
||||
"//src/main/protobuf/net/eagle0/eagle/common:unaffiliated_hero_quest_scala_proto",
|
||||
"//src/main/scala/net/eagle0/eagle:eagle_pkg",
|
||||
"//src/main/scala/net/eagle0/eagle/library/actions/impl/action:check_for_fulfilled_quests_action",
|
||||
"//src/main/scala/net/eagle0/eagle/library/actions/impl/common:protoless_sequential_results_action",
|
||||
@@ -70,7 +69,6 @@ scala_test(
|
||||
"//src/main/scala/net/eagle0/eagle/model/state/quest",
|
||||
"//src/main/scala/net/eagle0/eagle/model/state/quest/concrete",
|
||||
"//src/main/scala/net/eagle0/eagle/model/state/unaffiliated_hero",
|
||||
"//src/test/scala/net/eagle0/common:proto_matchers",
|
||||
"//src/test/scala/net/eagle0/eagle/library/actions/impl:action_impl_pkg",
|
||||
"//src/test/scala/net/eagle0/eagle/library/util:idable",
|
||||
],
|
||||
@@ -1012,7 +1010,6 @@ scala_test(
|
||||
"//src/main/scala/net/eagle0/eagle/model/action_result/types",
|
||||
"//src/main/scala/net/eagle0/eagle/model/state:army",
|
||||
"//src/main/scala/net/eagle0/eagle/model/state/province/concrete",
|
||||
"//src/test/scala/net/eagle0/common:proto_matchers",
|
||||
"//src/test/scala/net/eagle0/eagle/library/actions/impl:action_impl_pkg",
|
||||
"//src/test/scala/net/eagle0/eagle/library/util:idable",
|
||||
],
|
||||
|
||||
+1
-2
@@ -1,6 +1,5 @@
|
||||
package net.eagle0.eagle.library.actions.impl.action
|
||||
|
||||
import net.eagle0.common.ProtoMatchers
|
||||
import net.eagle0.eagle.{GameId, RoundId}
|
||||
import net.eagle0.eagle.library.settings.{
|
||||
MinSupportForTaxes,
|
||||
@@ -34,7 +33,7 @@ import org.scalatest.flatspec.AnyFlatSpec
|
||||
import org.scalatest.matchers.should.Matchers
|
||||
import org.scalatest.BeforeAndAfterEach
|
||||
|
||||
class CheckForFulfilledQuestsActionTest extends AnyFlatSpec with Matchers with ProtoMatchers with BeforeAndAfterEach {
|
||||
class CheckForFulfilledQuestsActionTest extends AnyFlatSpec with Matchers with BeforeAndAfterEach {
|
||||
private val fid = 9
|
||||
private val otherFid = 7
|
||||
private val province = ProvinceC(id = 21, rulingFactionId = Some(fid))
|
||||
|
||||
+1
-2
@@ -1,6 +1,5 @@
|
||||
package net.eagle0.eagle.library.actions.impl.action
|
||||
|
||||
import net.eagle0.common.ProtoMatchers
|
||||
import net.eagle0.eagle.{FactionId, ProvinceId, RoundId}
|
||||
import net.eagle0.eagle.model.action_result.changed_province.concrete.ChangedProvinceC
|
||||
import net.eagle0.eagle.model.action_result.types.ActionResultType.{ArmyShattered, WithdrawnArmyReturns}
|
||||
@@ -12,7 +11,7 @@ import org.scalatest.flatspec.AnyFlatSpec
|
||||
import org.scalatest.matchers.should.Matchers
|
||||
import org.scalatest.Inside.inside
|
||||
|
||||
class WithdrawnArmiesReturnHomeActionTest extends AnyFlatSpec with Matchers with ProtoMatchers {
|
||||
class WithdrawnArmiesReturnHomeActionTest extends AnyFlatSpec with Matchers {
|
||||
|
||||
private val withdrawingFactionId: FactionId = 31
|
||||
private val currentRoundId: RoundId = 8721
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package net.eagle0.eagle.library.actions.impl.command
|
||||
|
||||
import net.eagle0.common.ProtoMatchers
|
||||
import net.eagle0.eagle.library.settings.{
|
||||
ActionVigorCost,
|
||||
AlmsMaxCharismaXp,
|
||||
@@ -28,7 +27,7 @@ import org.scalatest.BeforeAndAfterEach
|
||||
import org.scalatest.Inside.inside
|
||||
import org.scalatest.LoneElement.convertToCollectionLoneElementWrapper
|
||||
|
||||
class AlmsCommandTest extends AnyFlatSpec with Matchers with ProtoMatchers with BeforeAndAfterEach {
|
||||
class AlmsCommandTest extends AnyFlatSpec with Matchers with BeforeAndAfterEach {
|
||||
|
||||
private val actionVigorCost = 15
|
||||
override def beforeEach(): Unit = {
|
||||
|
||||
@@ -243,7 +243,6 @@ scala_test(
|
||||
name = "exile_vassal_command_test",
|
||||
srcs = ["ExileVassalCommandTest.scala"],
|
||||
deps = [
|
||||
"//src/main/protobuf/net/eagle0/eagle/internal:unaffiliated_hero_scala_proto",
|
||||
"//src/main/scala/net/eagle0/eagle:eagle_pkg",
|
||||
"//src/main/scala/net/eagle0/eagle/library:eagle_client_exception",
|
||||
"//src/main/scala/net/eagle0/eagle/library/actions/impl/command:exile_vassal_command",
|
||||
@@ -701,7 +700,6 @@ scala_test(
|
||||
"//src/main/scala/net/eagle0/eagle/model/state/quest/concrete",
|
||||
"//src/main/scala/net/eagle0/eagle/model/state/unaffiliated_hero",
|
||||
"//src/main/scala/net/eagle0/eagle/model/state/unaffiliated_hero/concrete",
|
||||
"//src/test/scala/net/eagle0/common:proto_matchers",
|
||||
"//src/test/scala/net/eagle0/eagle/library/util:idable",
|
||||
],
|
||||
)
|
||||
|
||||
-1
@@ -5,7 +5,6 @@ import net.eagle0.eagle.library.settings.ExiledHeroFactionBias
|
||||
import net.eagle0.eagle.library.EagleClientException
|
||||
import net.eagle0.eagle.model.action_result.changed_province.concrete.ChangedProvinceC
|
||||
import net.eagle0.eagle.model.action_result.concrete.{ChangedHeroC, NotificationC}
|
||||
import net.eagle0.eagle.model.action_result.generated_text_request.LlmRequestT
|
||||
import net.eagle0.eagle.model.action_result.generated_text_request.LlmRequestT.ExileVassalMessage
|
||||
import net.eagle0.eagle.model.action_result.types.ActionResultType.VassalExiled
|
||||
import net.eagle0.eagle.model.action_result.NotificationDetails
|
||||
|
||||
@@ -5,6 +5,7 @@ scala_test(
|
||||
srcs = ["QuestFulfillmentUtilsTest.scala"],
|
||||
deps = [
|
||||
"//src/main/protobuf/net/eagle0/eagle/common:battalion_type_scala_proto",
|
||||
"//src/main/protobuf/net/eagle0/eagle/common:unaffiliated_hero_quest_scala_proto",
|
||||
"//src/main/scala/net/eagle0/eagle:eagle_pkg",
|
||||
"//src/main/scala/net/eagle0/eagle/library/util/quest_fulfillment:quest_fulfillment_utils",
|
||||
"//src/main/scala/net/eagle0/eagle/model/action_result:changed_battalion_trait",
|
||||
|
||||
Reference in New Issue
Block a user