From b6050795ec2f7fb3571a78adf2c6c3f8fc7953d4 Mon Sep 17 00:00:00 2001 From: Domenico Date: Tue, 25 Jun 2024 10:19:21 +0200 Subject: [PATCH 1/3] Done pt1 #2016 --- gradle/depend.gradle | 46 -------------------------------------------- 1 file changed, 46 deletions(-) diff --git a/gradle/depend.gradle b/gradle/depend.gradle index 838cc0239..34af784b4 100644 --- a/gradle/depend.gradle +++ b/gradle/depend.gradle @@ -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" - }) } From e462c7a68831b516449001127e1b42a74dae0cb6 Mon Sep 17 00:00:00 2001 From: Domenico Date: Tue, 25 Jun 2024 11:58:00 +0200 Subject: [PATCH 2/3] Done pt2 #2016 --- scripts/build.gradle.kts | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/scripts/build.gradle.kts b/scripts/build.gradle.kts index 2b780ba11..6450fff6d 100644 --- a/scripts/build.gradle.kts +++ b/scripts/build.gradle.kts @@ -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; - if(appId == "tpay") - mapChangelog = getChangelogTpayMap() - else - mapChangelog = getChangelogMap() + mapChangelog = getChangelogMap() // Create map from versions in depend.gradle file val mapVersion: HashMap = createMapVersion() @@ -56,13 +53,9 @@ tasks.register("print-changelog-changed") { } tasks.register("commitversions") { doLast { - val tpaylib = "tpaylib" val appId = System.getProperty("args") var mapChangelog: LinkedHashMap; - if(appId == "tpay") - mapChangelog = getChangelogTpayMap() - else - mapChangelog = getChangelogMap() + mapChangelog = getChangelogMap() // Create map from versions in depend.gradle file val mapVersion: HashMap = createMapVersion() val outputGit = ByteArrayOutputStream() @@ -150,16 +143,6 @@ fun getChangelogMap(): LinkedHashMap = 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 = linkedMapOf( - "telepasspaymodel" to "TPM_", - "telepasspaynetwork" to "TPN_", - "tpaylib" to "TPL_" ) fun getVersionKeyFromModule(): LinkedHashMap = linkedMapOf( @@ -180,14 +163,7 @@ fun getVersionKeyFromModule(): LinkedHashMap = 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", ) /** @@ -518,4 +494,4 @@ tasks.register("update-version-lib") { } } -fun Map.inverseMap() = map { Pair(it.value, it.key) }.toMap() \ No newline at end of file +fun Map.inverseMap() = map { Pair(it.value, it.key) }.toMap() From a80d3b6bdc9dd0ccfa5715ea667ca49ed32a01a1 Mon Sep 17 00:00:00 2001 From: Domenico Date: Tue, 25 Jun 2024 14:33:40 +0200 Subject: [PATCH 3/3] Done pt2 #2016 --- gradle/depend.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/depend.gradle b/gradle/depend.gradle index 34af784b4..ef1d23e9b 100644 --- a/gradle/depend.gradle +++ b/gradle/depend.gradle @@ -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