Skip to content

Done pt1 #2016 #486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gaglileo merged 3 commits into from
Jun 26, 2024
Merged

Done pt1 #2016 #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b605079
Done pt1 #2016
dommy1985 Jun 25, 2024
e462c7a
Done pt2 #2016
dommy1985 Jun 25, 2024
a80d3b6
Done pt2 #2016
dommy1985 Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 1 addition & 47 deletions gradle/depend.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ ext {
// Android
android_version_array = ["utility", utilityVersion, "designsystem", designsystemVersion, "modelVersion", modelVersion, "coreVersion", coreVersion, "pay", payVersion, "ticket", ticketVersion, "search", searchVersion, "taxi", taxiVersion,
"taxi", taxiVersion, "scan", scanVersion, "transpo", transpoVersion, "evcharging", evchargingVersion, "tripo", tripoVersion, "mobilitySharing", mobilitySharingVersion, "commonState", commonStateVersion, "commonView", commonViewVersion,
"composeNavigation", composeNavigationVersion, "composeDs", composeDsVersion, "history", historyVersion, "map", mapVersion, "profile", profileVersion, "shop", shopVersion, "login", loginVersion]
"composeNavigation", composeNavigationVersion, "composeDs", composeDsVersion, "login", loginVersion]
min_sdk_version = 24
compile_sdk_version = 34
target_sdk_version = 34
Expand Down Expand Up @@ -272,51 +272,5 @@ ext {
exclude module: "$designsystemId"
})

historyIddep = dependencies.create("$urbiGroupId:$historyId:$historyVersion")

historyId_exclude = dependencies.create("$urbiGroupId:$historyId:$historyVersion", {
exclude module: "$composeNavigationId"
exclude module: "$composeDsId"
exclude module: "$commonStateId"
exclude module: "$mobilitySharingId"
exclude module: "$coreId"
exclude module: "$modelId"
exclude module: "$designsystemId"
})

shopIddep = dependencies.create("$urbiGroupId:$shopId:$shopVersion")

shopId_exclude = dependencies.create("$urbiGroupId:$shopId:$shopVersion", {
exclude module: "$composeNavigationId"
exclude module: "$composeDsId"
exclude module: "$commonStateId"
exclude module: "$payId"
exclude module: "$coreId"
exclude module: "$modelId"
exclude module: "$designsystemId"
})

profileIddep = dependencies.create("$urbiGroupId:$profileId:$profileVersion")

profileId_exclude = dependencies.create("$urbiGroupId:$profileId:$profileVersion", {
exclude module: "$composeNavigationId"
exclude module: "$composeDsId"
exclude module: "$commonStateId"
exclude module: "$payId"
exclude module: "$coreId"
exclude module: "$modelId"
exclude module: "$designsystemId"
})

mapIddep = dependencies.create("$urbiGroupId:$mapId:$mapVersion")

mapId_exclude = dependencies.create("$urbiGroupId:$mapId:$mapVersion", {
exclude module: "$composeNavigationId"
exclude module: "$composeDsId"
exclude module: "$commonStateId"
exclude module: "$payId"
exclude module: "$coreId"
exclude module: "$modelId"
exclude module: "$designsystemId"
})
}
30 changes: 3 additions & 27 deletions scripts/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,7 @@ tasks.register("uploadlib") {
println("No service file is force pull and uploaded, you know what you are doing.......")

var mapChangelog: LinkedHashMap<String, String>;
if(appId == "tpay")
mapChangelog = getChangelogTpayMap()
else
mapChangelog = getChangelogMap()
mapChangelog = getChangelogMap()

// Create map from versions in depend.gradle file
val mapVersion: HashMap<String, String> = createMapVersion()
Expand Down Expand Up @@ -56,13 +53,9 @@ tasks.register("print-changelog-changed") {
}
tasks.register("commitversions") {
doLast {
val tpaylib = "tpaylib"
val appId = System.getProperty("args")
var mapChangelog: LinkedHashMap<String, String>;
if(appId == "tpay")
mapChangelog = getChangelogTpayMap()
else
mapChangelog = getChangelogMap()
mapChangelog = getChangelogMap()
// Create map from versions in depend.gradle file
val mapVersion: HashMap<String, String> = createMapVersion()
val outputGit = ByteArrayOutputStream()
Expand Down Expand Up @@ -150,16 +143,6 @@ fun getChangelogMap(): LinkedHashMap<String, String> = linkedMapOf(
"transpo" to "TRN_",
"tripo" to "TRP_",
"mobilitylib" to "MBL_",
"shop" to "SHOP_",
"profile" to "PROFILE_",
"map" to "MAP_",
"history" to "HISTORY_"
)

fun getChangelogTpayMap(): LinkedHashMap<String, String> = linkedMapOf(
"telepasspaymodel" to "TPM_",
"telepasspaynetwork" to "TPN_",
"tpaylib" to "TPL_"
)

fun getVersionKeyFromModule(): LinkedHashMap<String, String> = linkedMapOf(
Expand All @@ -180,14 +163,7 @@ fun getVersionKeyFromModule(): LinkedHashMap<String, String> = linkedMapOf(
"commonview" to "commonViewVersion",
"composenavigation" to "composeNavigationVersion",
"composeds" to "composeDsVersion",
"history" to "historyVersion",
"map" to "mapVersion",
"profile" to "profileVersion",
"shop" to "shopVersion",
"login" to "loginVersion",
"telepasspaymodel" to "telepassModelVersion",
"telepasspaynetwork" to "telepassNetworkVersion",
"tpaylib" to "telepassLibVersion",
)

/**
Expand Down Expand Up @@ -518,4 +494,4 @@ tasks.register("update-version-lib") {
}
}

fun <K, V> Map<K, V>.inverseMap() = map { Pair(it.value, it.key) }.toMap()
fun <K, V> Map<K, V>.inverseMap() = map { Pair(it.value, it.key) }.toMap()