Skip to content

Commit cbdb85b

Browse files
committed
chore(pub): Rework setting package properties a bit
Make properties that are in any case set `lateinit` and reorder them for readability. Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
1 parent dab50b4 commit cbdb85b

File tree

1 file changed

+10
-8
lines changed
  • plugins/package-managers/pub/src/main/kotlin

1 file changed

+10
-8
lines changed

plugins/package-managers/pub/src/main/kotlin/Pub.kt

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -623,12 +623,12 @@ class Pub(override val descriptor: PluginDescriptor = PubFactory.descriptor, pri
623623
packageInfo.source != "sdk"
624624
}.forEach { (packageName, packageInfo) ->
625625
runCatching {
626-
val version = packageInfo.version.orEmpty()
626+
lateinit var rawName: String
627+
lateinit var vcs: VcsInfo
628+
629+
var authors = emptySet<String>()
627630
var description = ""
628-
var rawName = ""
629631
var homepageUrl = ""
630-
var vcs = VcsInfo.EMPTY
631-
var authors = emptySet<String>()
632632

633633
val source = packageInfo.source
634634

@@ -650,9 +650,9 @@ class Pub(override val descriptor: PluginDescriptor = PubFactory.descriptor, pri
650650
val pkgInfoFromYamlFile = readPackageInfoFromCache(packageInfo, workingDir)
651651

652652
rawName = pkgInfoFromYamlFile?.name ?: packageName
653+
authors = pkgInfoFromYamlFile?.let { parseAuthors(it) }.orEmpty()
653654
description = pkgInfoFromYamlFile?.description.orEmpty().trim()
654655
homepageUrl = pkgInfoFromYamlFile?.homepage.orEmpty()
655-
authors = pkgInfoFromYamlFile?.let { parseAuthors(it) }.orEmpty()
656656

657657
vcs = VcsInfo(
658658
type = VcsType.GIT,
@@ -666,9 +666,9 @@ class Pub(override val descriptor: PluginDescriptor = PubFactory.descriptor, pri
666666
val pkgInfoFromYamlFile = readPackageInfoFromCache(packageInfo, workingDir)
667667

668668
rawName = pkgInfoFromYamlFile?.name.orEmpty()
669+
authors = pkgInfoFromYamlFile?.let { parseAuthors(it) }.orEmpty()
669670
description = pkgInfoFromYamlFile?.description.orEmpty().trim()
670671
homepageUrl = pkgInfoFromYamlFile?.homepage.orEmpty()
671-
authors = pkgInfoFromYamlFile?.let { parseAuthors(it) }.orEmpty()
672672

673673
val repositoryUrl = pkgInfoFromYamlFile?.repository.orEmpty()
674674

@@ -685,18 +685,20 @@ class Pub(override val descriptor: PluginDescriptor = PubFactory.descriptor, pri
685685
containsFlutter = true
686686
// Set hardcoded package details.
687687
rawName = "flutter"
688-
homepageUrl = "https://github.com/flutter/flutter"
689688
description = "Flutter SDK"
689+
homepageUrl = "https://github.com/flutter/flutter"
690690
}
691691

692692
"flutter_test" -> {
693693
// Set hardcoded package details.
694694
rawName = "flutter_test"
695-
homepageUrl = "https://github.com/flutter/flutter/tree/master/packages/flutter_test"
696695
description = "Flutter Test SDK"
696+
homepageUrl = "https://github.com/flutter/flutter/tree/master/packages/flutter_test"
697697
}
698698
}
699699

700+
val version = packageInfo.version.orEmpty()
701+
700702
if (version.isEmpty()) {
701703
logger.warn { "No version information found for package $rawName." }
702704
}

0 commit comments

Comments
 (0)