Skip to content

Commit 2904665

Browse files
refactor: make a lot of data models internal that don't need to be public.
1 parent d4930c7 commit 2904665

File tree

74 files changed

+265
-197
lines changed

Some content is hidden

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

74 files changed

+265
-197
lines changed

build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,12 @@ dependencies {
108108
implementation(platform(libs.kotlin.bom))
109109
implementation(platform(libs.okio.bom))
110110

111-
api(libs.guava) {
112-
because("Graphs")
113-
}
114111
api(libs.javax.inject)
115112
api(libs.moshi.core)
116113
api(libs.moshix.sealed.runtime)
117114

118115
implementation(project(":graph-support"))
116+
implementation(libs.guava)
119117
implementation(libs.kotlin.stdlib.jdk8)
120118
implementation(libs.kotlin.editor.relocated)
121119
implementation(libs.moshi.kotlin)

src/main/kotlin/com/autonomousapps/internal/Bundles.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ import com.autonomousapps.graph.Graphs.children
77
import com.autonomousapps.graph.Graphs.reachableNodes
88
import com.autonomousapps.model.*
99
import com.autonomousapps.model.Coordinates.Companion.copy
10-
import com.autonomousapps.model.declaration.Bucket
11-
import com.autonomousapps.model.intermediates.Usage
10+
import com.autonomousapps.model.declaration.internal.Bucket
11+
import com.autonomousapps.model.internal.DependencyGraphView
12+
import com.autonomousapps.model.internal.intermediates.Usage
1213

1314
/**
1415
* :proj

src/main/kotlin/com/autonomousapps/internal/BytecodeParsers.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import com.autonomousapps.internal.asm.ClassReader
77
import com.autonomousapps.internal.utils.JAVA_FQCN_REGEX_SLASHY
88
import com.autonomousapps.internal.utils.asSequenceOfClassFiles
99
import com.autonomousapps.internal.utils.getLogger
10-
import com.autonomousapps.model.intermediates.consumer.ExplodingBytecode
11-
import com.autonomousapps.model.intermediates.consumer.MemberAccess
10+
import com.autonomousapps.model.internal.intermediates.consumer.ExplodingBytecode
11+
import com.autonomousapps.model.internal.intermediates.consumer.MemberAccess
1212
import org.gradle.api.logging.Logger
1313
import java.io.File
1414

src/main/kotlin/com/autonomousapps/internal/JarExploder.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ package com.autonomousapps.internal
55
import com.autonomousapps.internal.asm.ClassReader
66
import com.autonomousapps.internal.utils.asSequenceOfClassFiles
77
import com.autonomousapps.internal.utils.getLogger
8-
import com.autonomousapps.model.KtFile
9-
import com.autonomousapps.model.PhysicalArtifact
10-
import com.autonomousapps.model.PhysicalArtifact.Mode
11-
import com.autonomousapps.model.intermediates.AndroidLinterDependency
12-
import com.autonomousapps.model.intermediates.producer.ExplodedJar
13-
import com.autonomousapps.model.intermediates.ExplodingJar
8+
import com.autonomousapps.model.internal.KtFile
9+
import com.autonomousapps.model.internal.PhysicalArtifact
10+
import com.autonomousapps.model.internal.PhysicalArtifact.Mode
11+
import com.autonomousapps.model.internal.intermediates.AndroidLinterDependency
12+
import com.autonomousapps.model.internal.intermediates.producer.ExplodedJar
13+
import com.autonomousapps.model.internal.intermediates.ExplodingJar
1414
import com.autonomousapps.services.InMemoryCache
1515
import com.autonomousapps.tasks.ExplodeJarTask
1616
import java.util.zip.ZipFile

src/main/kotlin/com/autonomousapps/internal/asm.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import com.autonomousapps.internal.kotlin.AccessFlags
99
import com.autonomousapps.internal.utils.METHOD_DESCRIPTOR_REGEX
1010
import com.autonomousapps.internal.utils.efficient
1111
import com.autonomousapps.internal.utils.genericTypes
12-
import com.autonomousapps.model.intermediates.producer.Member
13-
import com.autonomousapps.model.intermediates.consumer.MemberAccess
12+
import com.autonomousapps.model.internal.intermediates.producer.Member
13+
import com.autonomousapps.model.internal.intermediates.consumer.MemberAccess
1414
import kotlinx.metadata.jvm.Metadata
1515
import org.gradle.api.logging.Logger
1616
import java.util.SortedSet

src/main/kotlin/com/autonomousapps/internal/graph/GraphViewBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import com.autonomousapps.internal.isJavaPlatform
66
import com.autonomousapps.internal.utils.rootCoordinates
77
import com.autonomousapps.internal.utils.toCoordinates
88
import com.autonomousapps.model.Coordinates
9-
import com.autonomousapps.model.DependencyGraphView
9+
import com.autonomousapps.model.internal.DependencyGraphView
1010
import com.google.common.graph.Graph
1111
import org.gradle.api.artifacts.component.ProjectComponentIdentifier
1212
import org.gradle.api.artifacts.result.ResolvedComponentResult

src/main/kotlin/com/autonomousapps/internal/kotlin/abiDependencies.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import com.autonomousapps.internal.ClassNames.canonicalize
77
import com.autonomousapps.internal.utils.DESC_REGEX
88
import com.autonomousapps.internal.utils.allItems
99
import com.autonomousapps.internal.utils.flatMapToSet
10-
import com.autonomousapps.model.intermediates.consumer.ExplodingAbi
10+
import com.autonomousapps.model.internal.intermediates.consumer.ExplodingAbi
1111
import java.io.File
1212

1313
internal fun computeAbi(

src/main/kotlin/com/autonomousapps/internal/models.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import com.autonomousapps.internal.asm.Opcodes
66
import com.autonomousapps.internal.utils.efficient
77
import com.autonomousapps.internal.utils.filterNotToSet
88
import com.autonomousapps.internal.utils.mapToSet
9-
import com.autonomousapps.model.intermediates.producer.BinaryClass
10-
import com.autonomousapps.model.intermediates.producer.Member
9+
import com.autonomousapps.model.internal.intermediates.producer.BinaryClass
10+
import com.autonomousapps.model.internal.intermediates.producer.Member
1111
import com.squareup.moshi.JsonClass
1212
import java.lang.annotation.RetentionPolicy
1313
import java.util.regex.Pattern

src/main/kotlin/com/autonomousapps/internal/parse/explodeAndroidResSource.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import com.autonomousapps.internal.utils.document.map
1313
import com.autonomousapps.internal.utils.document.mapNotNull
1414
import com.autonomousapps.internal.utils.filterToOrderedSet
1515
import com.autonomousapps.internal.utils.mapToSet
16-
import com.autonomousapps.model.AndroidResSource
16+
import com.autonomousapps.model.internal.AndroidResSource
1717
import org.w3c.dom.Document
1818
import org.xml.sax.SAXParseException
1919
import java.io.File

src/main/kotlin/com/autonomousapps/internal/reason/DependencyAdviceExplainer.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ import com.autonomousapps.internal.utils.lowercase
1010
import com.autonomousapps.model.*
1111
import com.autonomousapps.model.declaration.SourceSetKind
1212
import com.autonomousapps.model.declaration.Variant
13-
import com.autonomousapps.model.intermediates.BundleTrace
14-
import com.autonomousapps.model.intermediates.Reason
15-
import com.autonomousapps.model.intermediates.Usage
13+
import com.autonomousapps.model.internal.DependencyGraphView
14+
import com.autonomousapps.model.internal.intermediates.BundleTrace
15+
import com.autonomousapps.model.internal.intermediates.Reason
16+
import com.autonomousapps.model.internal.intermediates.Usage
1617
import com.autonomousapps.tasks.ReasonTask
1718

1819
@Suppress("UnstableApiUsage") // guava

0 commit comments

Comments
 (0)