From 31ca21ea54f7072731e8a863873ba0f62cb9a829 Mon Sep 17 00:00:00 2001 From: Maxim Bachinsky Date: Tue, 29 Sep 2020 19:35:15 +0300 Subject: [PATCH] updated template after four sprints at runtime --- BuildScripts | 2 +- RoboSwag | 2 +- app/build.gradle.kts | 71 ++++++------------ app/keystore/touchin.jks | Bin 2092 -> 0 bytes app/signing_key.jks | Bin 0 -> 2082 bytes .../ru/touchin/template/SingleActivity.kt | 19 +++-- ...tUpNavigation.kt => StartUpCoordinator.kt} | 6 +- build.gradle.kts | 10 ++- buildSrc/src/main/kotlin/AndroidConfig.kt | 22 +++--- buildSrc/src/main/kotlin/DependencyHandler.kt | 11 ++- buildSrc/src/main/kotlin/Environment.kt | 13 ++++ buildSrc/src/main/kotlin/Library.kt | 11 ++- buildSrc/src/main/kotlin/Module.kt | 5 +- buildSrc/src/main/kotlin/Plugins.kt | 1 + buildSrc/src/main/kotlin/SigningConfig.kt | 37 --------- buildSrc/src/main/kotlin/Version.kt | 11 ++- .../src/main/kotlin/flavours/ApiFlavour.kt | 15 ++-- .../src/main/kotlin/flavours/BuildType.kt | 32 +++++--- buildSrc/src/main/kotlin/flavours/Flavour.kt | 11 +-- .../main/kotlin/flavours/ProguardFlavour.kt | 6 -- .../src/main/kotlin/flavours/SigningConfig.kt | 23 ++++++ .../main/kotlin/plugins/BaseAndroidPlugin.kt | 9 +++ core/core_data/build.gradle.kts | 3 + core/core_data/src/main/AndroidManifest.xml | 1 + core/core_domain/build.gradle.kts | 3 + core/core_domain/src/main/AndroidManifest.xml | 1 + core/core_network/build.gradle.kts | 20 +++-- settings.gradle.kts | 1 + 28 files changed, 190 insertions(+), 156 deletions(-) delete mode 100644 app/keystore/touchin.jks create mode 100644 app/signing_key.jks rename app/src/main/java/ru/touchin/template/navigation/{StartUpNavigation.kt => StartUpCoordinator.kt} (68%) create mode 100644 buildSrc/src/main/kotlin/Environment.kt delete mode 100644 buildSrc/src/main/kotlin/SigningConfig.kt delete mode 100644 buildSrc/src/main/kotlin/flavours/ProguardFlavour.kt create mode 100644 buildSrc/src/main/kotlin/flavours/SigningConfig.kt create mode 100644 core/core_data/build.gradle.kts create mode 100644 core/core_data/src/main/AndroidManifest.xml create mode 100644 core/core_domain/build.gradle.kts create mode 100644 core/core_domain/src/main/AndroidManifest.xml diff --git a/BuildScripts b/BuildScripts index 7850b7f..be9bbb9 160000 --- a/BuildScripts +++ b/BuildScripts @@ -1 +1 @@ -Subproject commit 7850b7f0cdd5d261e532d265b33464a9140a6d45 +Subproject commit be9bbb971e0864178ebf6d2f22bcd40d7fecd24e diff --git a/RoboSwag b/RoboSwag index 7345307..09061c1 160000 --- a/RoboSwag +++ b/RoboSwag @@ -1 +1 @@ -Subproject commit 73453070050363058cd05648362723b44b30d9a6 +Subproject commit 09061c1bcfd951127f1a62c25990a5c9d9cbbbce diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 728b1d3..a40f352 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -2,74 +2,42 @@ plugins { id(Plugins.ANDROID_APP_PLUGIN_WITH_DEFAULT_CONFIG) id(Plugins.FIREBASE_CRASH) id(Plugins.GOOGLE_SERVICES) + id(Plugins.LICENCE_PLUGIN) } -val customEndpoint: String? = System.getenv("CUSTOM_ENDPOINT")?.takeIf(String::isNotBlank) +val customEndpoint: String? = Environment.ENDPOINT.getenv()?.takeIf(String::isNotBlank) android { - signingConfigs { - addConfig(SigningConfig.Test) - addConfig(SigningConfig.Prod) - } + configureSigningConfig(this@Build_gradle::file) - defaultConfig { - applicationId = AndroidConfig.TEST_APP_ID - signingConfig = signingConfigs.getByName(SigningConfig.Test.name) + with(defaultConfig) { + applicationId = Environment.APP_ID.getenv() ?: AndroidConfig.TEST_APP_ID + signingConfig = signingConfigs.getByName(SigningConfig.CONFIG_NAME) } firebaseCrashlytics { mappingFileUploadEnabled = true } - buildTypes { - addBuildType(BuildType.Debug) - addBuildType(BuildType.Release) - } + addBuildType(BuildType.Debug, buildScriptDir = buildScriptDir) + addBuildType(BuildType.Release, buildScriptDir = buildScriptDir) flavorDimensions( - ProguardFlavour.DIMENSION_NAME, ApiFlavour.DIMENSION_NAME, SSLPinningFlavour.DIMENSION_NAME, TestPanelFlavour.DIMENSION_NAME ) - addFlavour(ApiFlavour.MockDev, customEndpoint) - addFlavour(ApiFlavour.TouchinTest, customEndpoint) - addFlavour(ApiFlavour.CustomerProd, customEndpoint) + addFlavour(flavour = ApiFlavour.CustomerStage, customEndpoint = customEndpoint) + addFlavour(flavour = ApiFlavour.CustomerProd, customEndpoint = customEndpoint) addFlavour(SSLPinningFlavour.OFF) addFlavour(SSLPinningFlavour.ON) - productFlavors { - create(ProguardFlavour.NO_OBFUSCATE) { - dimension = ProguardFlavour.DIMENSION_NAME - setProguardFiles(listOf( - getDefaultProguardFile("proguard-android.txt"), - "$rootProject.projectDir/BuildScripts/proguard/noObfuscate.pro" - )) - } - - create(ProguardFlavour.OBFUSCATE) { - dimension = ProguardFlavour.DIMENSION_NAME - setProguardFiles(listOf( - getDefaultProguardFile("proguard-android.txt"), - "$rootProject.projectDir/BuildScripts/proguard/obfuscate.pro" - )) - } - - addEmptyFlavour(TestPanelFlavour.OFF) - addEmptyFlavour(TestPanelFlavour.ON) - } - - variantFilter = Action { - if (name.contentEquals(AndroidConfig.PROD_BUILD_NAME)) { - (defaultConfig as com.android.build.gradle.internal.dsl.BaseFlavor).apply { - applicationId = AndroidConfig.PROD_APP_ID - signingConfig = signingConfigs.getByName(SigningConfig.Prod.name) - } - } - } + addEmptyFlavour(TestPanelFlavour.OFF) + addEmptyFlavour(TestPanelFlavour.ON) + ignoreCustomerProdFlavourIfReleaseIsDebuggable() } androidExtensions { @@ -85,13 +53,22 @@ dependencies { retrofit() moshi() navigation() - coreNetwork() leakCanary() sharedPrefs() chucker() implementation(Library.FIREBASE_ANAL) implementation(Library.FIREBASE_CRASH) implementation(Library.FIREBASE_PERF) + implementation(Library.ANDROIDX_SECURE) + coreNetwork() + coreStrings() + implementationModule(Module.Core.UI) + implementationModule(Module.Core.UTILS) + implementationModule(Module.Core.DATA) + implementationModule(Module.RoboSwag.UTILS) } -apply(from = "${rootProject.ext["buildScriptsDir"]}/gradle/applicationFileNaming.gradle") +apply(from = "$buildScriptDir/gradle/scripts/applicationFileNaming.gradle") + +val Project.buildScriptDir: String + get() = rootProject.ext["buildScriptsDir"] as String diff --git a/app/keystore/touchin.jks b/app/keystore/touchin.jks deleted file mode 100644 index f750721b05cf9d8814da19473901a8c2d3ee2c98..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2092 zcma)+cQo4z8^`mD#17gTMb)ZMiim`uMsKgyY>O(|+ACt*q9I(hX;7p&-ah-AD@4o=Q-c!oX;`+m<|Ggz^4KJ3ESh}@XlBd zpHs$JpbNV}ASi%{gd8DwSUD9~0SF)uJ_7(y5F`?^9BuyLQ{aFRZ~b#T)-|zTny*Ac zFQ;cc#)5XY#`{U+l6u5~oW}XDos)HN@9;T)1|YCFVaU7tMx|INKb+gFEzQ%o?e6O^ z$TiRR&1f2#-Gve%f)SroGb*mTPLR4pSCjJ`MZslqTBT+%dxWUvLa7s;7+hwOC0Q9< zWKLD&$d)$hvXP|CSufApv&2;~6 zT7sy@1a7nB=hAdDK5{_|5*HSc(#&5A=}*pqcvCuaZfK!;ihl;Z^omVFL*r z#6=Qi{IyFmihB$AIV9emc|O^vttI}~KD+Ug791V5(i0+Ca5LYb#UjmVn%0^=9V{x- zyK6ds);2{dk|#)fNwhCG;Xp@?PqPH_)Nbur&p;+^%(L9nYr^cXc&>!+nBT}WyWvcxp?m5vY5}> zC<4{PH6C>Nv6qK(pZlLWa+K7%0Fl<0CUqxi8BTHV4f%{oHW@tyACYFCP5l?Qs^*L3 zy|tg^5dW$-Az|b<=^qOOyV`qdAHRb^HA$X`q~=!SspPH2WsJ^xV%xHm4xAZe zukMHDg4ZodtIkwAa$74%R_m&2SJxyc9vSTix_j*gF&!oaTwyVq>GgNO3<352v0my* z<T&|h2ml2lNQZ=zja~c`vmcP-asBBG|OC~UdA2MieAt8e>2Q|S5;AII* zZ6eWV|DJFVbLUS=my8`8j#CP8Yc7Yb^>*~h;~k0^l@~JFSbemR1Nn`j3s2;_!jck$ zxlP`a@hz6vF_DjTA*6+@JwIx#OD7{$<H93;?*GAcTYpH-eLu#S+4Hj>Z3xlM3IdKTnDC-2eQF zxF`fu(LkV(XoQ-o8WMe92!=u-P%4=J;{P!r5|H}$+EXdBL;}2^)5|!)kpKWnO@?Uk zFItuUNU@Q=Cpk@K43%+m!}+9LjIG}{AVs+shmDsS`ZfcJHX2m@JzXlDx$CuXrgWN1 z00%I4bV?d-q+O2?ZN5>vysT;>lQ`Ek`7^-p;Ui07JX<^NDD-Z{rge#A?=xa!4^jV` zyyzIy{Sx-~|L~amFERrj_17`(EU^kvOQ6lW&uDzfh0m4 zA$Hom7!O1c!cT7a1upD;bgQy$U+>PU0U574R`Tx>Pk(n>A^?JQYf}3OI|px3T|nAmC_0ego%4PQZskALTFxx* z9WPK{>tdZ-93Lv?RBx({>$_da8;1|YK#a5|CNg7eI_8n2A$-~!Lp?s_Ukf24m#gJ` zj}6l8AFE<2V9ogpTl!ht@GV~Y#f6ajw(fPJfwpfwdeZ_Mfd|_a0RPr_&YSm-7X3yS zAG?Mt^Xr5zTz?hKnpr2AY`9-^{<3v-7Hu29jX6v{BoivlJ~*EhX3W$*=iEkNz8tY{ GRsIczS=3tq diff --git a/app/signing_key.jks b/app/signing_key.jks new file mode 100644 index 0000000000000000000000000000000000000000..514ea0dce4d2700ee1dc326f31ba669fb7f20502 GIT binary patch literal 2082 zcmaKsX*AS}8^`B2%-D^x6f@b%wew>PaaE=gF$mpI$XW)2vSf=IG9xVrEr`k3w}`Qh zWJH9zj2gx^k_?e-9bsJOp8t#c>i^>V;`8D;&vU-dIUn94ZxI54K=%Ut8-cLkaBn|+ z&>n|ER%ojb2n+y;{5zmHTv!th@ByAg$64vB9d}|yX8Yqi@C7SR>tHs?`#|NBG?VLwz`*wH@-;1=5 zFlM1QEXkFF>n`1^Wkjzl?s4K;+fEXSRx_d#%#U=DH~9KSYi|6d1@qC?D152Aj&w%a zrYbF&+~WzXF}7TzZ`=sskr<{wOo_h^VXNdrX}#93!}=+|UCo3}QO6xcW4z2Hy{k{y zu$iU3#OWkf&ou-@MYCjF9N*>srWM|I}26BSXIn4cc(muNrqDznfDv2KfpIeMA4K3x2PZ#FaTEijL?HPP&w8lv_hm23 z?dD<71l}TtcjT-~-o>#Fl-M09)F^#AkI}{!-(a6eh_UZbGOlKSpxq8x|6(!WlJho` z^}@@*Ae)6dmZFr_C}%bQtS{A&`-XD&z;TLnk>#3ee@gUv8Zz|KxmV^ZPj%*m(l>9W zdt3nP$XX{WX%bdP=Z@4IG=>kb6rE}2(TPKNHX&2j5G!o>e!jP{<%yq2&RS>BtB@?s zt6F>!(ory^0;(XO^;<)wnm5hNagZs7PQj;ooowjCjT_;tZF+B3#STQhVQ@LF# zIM*{Ouu3mAxh{2|dHvDRnd{k!CPFpUG9tqRs#EN*J9X zN{Qz>x};+hbK{j8{87{t<^{5OeB7MlfI4Pm>RRg;Rb056q@O~#vrmsr{fEz$c&0@s zzp?U(q4tQFI*LHGSNMK8?;cW~YO7of7$WEt;r63h71h4kTp6glKkE=X(BhUquVL5E zb7+hT6uyI%KM-Zb^j3Z3e(-=_)J-Lw%!s`#TmgT4bYqBlkr?!DtuEOp7$fuDJlO1# z+dQXEF~k^)hVt%+rk2UPzl>_DXLCVMS{yd(n`+ zQczThkPn0*ze}PUf|{J9PlAkbhdafuXT?e0`0G*73C9oB*;O=nih#7}!*jG!<_wx4 z)6kdeD|)1%EzWl294>P3l2>1kvPBA{xeg7jU42!?_&p&x>ZQ^!lExo_&udAXy0^orRYjjoj@RB|y=!W3B=nnTC6_E@UUC*4?6$6cPH+3z zn6{j0b4aA^m*Lp8Gn_4YUYQ+z^K1m|_E-?fX~nJ3L-SuV!kl$5pz)q7M?fNU7$gGp zd_E`uh4M#|J5)h2xR6GYWzsJ(01$yeK%|~5cmU4#7eAk*gl9mgZ%}ZAVnm>)51xR( z4$2=8(+5FAePcaCv@sfe@qm~CW)IQ-!~Z`_1eE`~Y){2}L;wNVyGIyG1ONzm@QZ_X zVXmRoj?v6^Nd7rjuJRl={jp@WlgxddiK(%HD22ADBtVyG@A>kX;DA}dm|$-lRC7;KcFcA(|@_ED>Eqi($_zR05pf7Wu> z%|~QvTLP%-h)8_SD{Kj*D>JfQlWLw1RU-pT^6P1NqKclpZ3`NTU_ z<+6E+SxLVo%bbzL21b$`+3Kh{iK~GEwAzb4u zMf)avQt%J!^&1~xzGRRFZExuuZ{3W@zZEm}>8q(|(^BKN4GNA<{Z;_w10X&+f`);DuV97u;Hp;*O`>qOCTCT~0;dIRf zv(}fU1Ij8R*k{A0+E}d?v%v=>#*=57lP#X+O-=Nh27>NOD8PyU-z_pduh&g`*CapP zW^+&l!d.addConfig(config: SigningConfig) { - create(config.name) { - storeFile = config.storeFile - storePassword = config.storePassword - keyAlias = config.keyAlias - keyPassword = config.keyPassword - } -} diff --git a/buildSrc/src/main/kotlin/Version.kt b/buildSrc/src/main/kotlin/Version.kt index 7f0626d..22db47b 100644 --- a/buildSrc/src/main/kotlin/Version.kt +++ b/buildSrc/src/main/kotlin/Version.kt @@ -9,10 +9,14 @@ object Version { const val ANDROIDX_APPCOMPAT = "1.0.2" const val ANDROIDX_CONSTRAINT = "2.0.0-beta4" const val ANDROIDX_FRAGMENT = "1.2.1" + const val ANDROIDX_SECURE = "1.0.0-rc02" + const val ANDROIDX_BIOMETRIC = "1.0.1" - const val ANDROID_MATERIAL = "1.1.0" + const val ANDROID_MATERIAL = "1.2.0-rc01" + const val SWIPE_TO_REFRESH = "1.0.0" const val ANDROID_LIFECYCLE = "2.2.0" - const val SWIPE_REFRESH = "1.0.0" + + const val PERMISSION_DISPATCHER = "4.8.0" const val DAGGER = "2.27" const val DAGGER_INJECT_ASSISTED = "0.5.2" @@ -33,10 +37,11 @@ object Version { const val FIREBASE_CRASH = "17.1.0" const val FIREBASE_PERF = "19.0.7" const val GOOGLE_SERVICES_PLUGIN = "4.3.3" - const val FIREBASE_PERF_PLUGIN = "1.3.1" const val FIREBASE_CRASH_PLUGIN = "2.2.0" const val LEAK_CANARY = "2.4" const val CHUCKER = "3.2.0" + const val LICENCE_LIBRARY = "17.0.0" + } diff --git a/buildSrc/src/main/kotlin/flavours/ApiFlavour.kt b/buildSrc/src/main/kotlin/flavours/ApiFlavour.kt index 1bc9704..44ff847 100644 --- a/buildSrc/src/main/kotlin/flavours/ApiFlavour.kt +++ b/buildSrc/src/main/kotlin/flavours/ApiFlavour.kt @@ -9,19 +9,16 @@ sealed class ApiFlavour( const val DIMENSION_NAME = "apiEndpoint" } - object MockDev : ApiFlavour( - name = "mockDev", - apiUrl = "url1" - ) - - object TouchinTest : ApiFlavour( - name = "touchinTest", - apiUrl = "url2" + // TODO: change url + object CustomerStage : ApiFlavour( + name = "customerStage", + apiUrl = "https://wallet-api.staging.mnxsc.tech" ) + // TODO: change url object CustomerProd : ApiFlavour( name = "customerProd", - apiUrl = "url3" + apiUrl = "https://wallet-api.prod.mnxsc.tech" ) } diff --git a/buildSrc/src/main/kotlin/flavours/BuildType.kt b/buildSrc/src/main/kotlin/flavours/BuildType.kt index ea4f548..c6193a5 100644 --- a/buildSrc/src/main/kotlin/flavours/BuildType.kt +++ b/buildSrc/src/main/kotlin/flavours/BuildType.kt @@ -1,30 +1,38 @@ -import org.gradle.api.NamedDomainObjectContainer +import com.android.build.gradle.BaseExtension -fun NamedDomainObjectContainer.addBuildType( - type: BuildType +fun BaseExtension.addBuildType( + type: BuildType, + buildScriptDir: String ) { - getByName(type.name) { - isMinifyEnabled = type.isMinifyEnabled - isShrinkResources = type.isShrinkResources + buildTypes { + getByName(type.name) { + isMinifyEnabled = type.optimizeAndObfuscate + isShrinkResources = type.optimizeAndObfuscate + if (type.optimizeAndObfuscate) { + val proguardFile = if (AndroidConfig.RELEASE_DEBUGGABLE) "noObfuscate.pro" else "obfuscate.pro" + setProguardFiles(listOfNotNull( + getDefaultProguardFile("proguard-android-optimize.txt"), + "$buildScriptDir/proguard/$proguardFile", + "proguard/projectConfig.pro" + )) + } + } } } sealed class BuildType( val name: String, - val isMinifyEnabled: Boolean, - val isShrinkResources: Boolean + val optimizeAndObfuscate: Boolean ) { object Debug : BuildType( name = "debug", - isMinifyEnabled = false, - isShrinkResources = false + optimizeAndObfuscate = false ) object Release : BuildType( name = "release", - isMinifyEnabled = true, - isShrinkResources = true + optimizeAndObfuscate = true ) } diff --git a/buildSrc/src/main/kotlin/flavours/Flavour.kt b/buildSrc/src/main/kotlin/flavours/Flavour.kt index d2ba569..4190d47 100644 --- a/buildSrc/src/main/kotlin/flavours/Flavour.kt +++ b/buildSrc/src/main/kotlin/flavours/Flavour.kt @@ -1,10 +1,11 @@ -import com.android.build.gradle.internal.dsl.ProductFlavor -import org.gradle.api.NamedDomainObjectContainer +import com.android.build.gradle.BaseExtension abstract class Flavour(val flavourName: String, val dimensionName: String) -fun NamedDomainObjectContainer.addEmptyFlavour(flavour: Flavour) { - create(flavour.flavourName) { - dimension = flavour.dimensionName +fun BaseExtension.addEmptyFlavour(flavour: Flavour) { + productFlavors { + create(flavour.flavourName) { + dimension = flavour.dimensionName + } } } diff --git a/buildSrc/src/main/kotlin/flavours/ProguardFlavour.kt b/buildSrc/src/main/kotlin/flavours/ProguardFlavour.kt deleted file mode 100644 index 62731ce..0000000 --- a/buildSrc/src/main/kotlin/flavours/ProguardFlavour.kt +++ /dev/null @@ -1,6 +0,0 @@ -object ProguardFlavour { - const val DIMENSION_NAME = "proguardSettings" - - const val NO_OBFUSCATE = "noObfuscate" - const val OBFUSCATE = "obfuscate" -} diff --git a/buildSrc/src/main/kotlin/flavours/SigningConfig.kt b/buildSrc/src/main/kotlin/flavours/SigningConfig.kt new file mode 100644 index 0000000..31374cb --- /dev/null +++ b/buildSrc/src/main/kotlin/flavours/SigningConfig.kt @@ -0,0 +1,23 @@ +import com.android.build.gradle.BaseExtension +import java.io.File + +object SigningConfig { + const val CONFIG_NAME: String = "signing_key" + const val PATH_TO_KEYSTORE_FILE: String = "signing_key.jks" + + const val DEFAULT_STORE_PASSWORD: String = "iphoneandroidwp7" + const val DEFAULT_KEY_ALIAS: String = "touchin" + const val DEFAULT_KEY_PASSWORD: String = "iphoneandroidwp7" +} + +fun BaseExtension.configureSigningConfig(getRelativeFile: (String) -> File) { + signingConfigs { + create(SigningConfig.CONFIG_NAME) { + storeFile = getRelativeFile(SigningConfig.PATH_TO_KEYSTORE_FILE) + storePassword = Environment.STORE_PASSWORD.getenv() ?: SigningConfig.DEFAULT_STORE_PASSWORD + keyAlias = Environment.KEY_ALIAS.getenv() ?: SigningConfig.DEFAULT_KEY_ALIAS + keyPassword = Environment.KEY_PASSWORD.getenv() ?: SigningConfig.DEFAULT_KEY_PASSWORD + } + } + +} diff --git a/buildSrc/src/main/kotlin/plugins/BaseAndroidPlugin.kt b/buildSrc/src/main/kotlin/plugins/BaseAndroidPlugin.kt index f6f5589..8983be3 100644 --- a/buildSrc/src/main/kotlin/plugins/BaseAndroidPlugin.kt +++ b/buildSrc/src/main/kotlin/plugins/BaseAndroidPlugin.kt @@ -1,6 +1,7 @@ package plugins import AndroidConfig +import BuildType import Plugins import com.android.build.gradle.BaseExtension import kotlinStd @@ -50,6 +51,14 @@ abstract class BaseAndroidPlugin : Plugin { jvmTarget = "1.8" } } + + if (AndroidConfig.RELEASE_DEBUGGABLE) { + buildTypes { + getByName(BuildType.Release.name) { + isDebuggable = true + } + } + } } private fun Project.configureDependencies() = dependencies { diff --git a/core/core_data/build.gradle.kts b/core/core_data/build.gradle.kts new file mode 100644 index 0000000..6b554b4 --- /dev/null +++ b/core/core_data/build.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id(Plugins.ANDROID_LIB_PLUGIN_WITH_DEFAULT_CONFIG) +} diff --git a/core/core_data/src/main/AndroidManifest.xml b/core/core_data/src/main/AndroidManifest.xml new file mode 100644 index 0000000..3fca1ad --- /dev/null +++ b/core/core_data/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/core/core_domain/build.gradle.kts b/core/core_domain/build.gradle.kts new file mode 100644 index 0000000..6b554b4 --- /dev/null +++ b/core/core_domain/build.gradle.kts @@ -0,0 +1,3 @@ +plugins { + id(Plugins.ANDROID_LIB_PLUGIN_WITH_DEFAULT_CONFIG) +} diff --git a/core/core_domain/src/main/AndroidManifest.xml b/core/core_domain/src/main/AndroidManifest.xml new file mode 100644 index 0000000..573c1d4 --- /dev/null +++ b/core/core_domain/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/core/core_network/build.gradle.kts b/core/core_network/build.gradle.kts index c028bc4..7bebdca 100644 --- a/core/core_network/build.gradle.kts +++ b/core/core_network/build.gradle.kts @@ -1,22 +1,20 @@ plugins { id(Plugins.ANDROID_LIB_PLUGIN_WITH_DEFAULT_CONFIG) +// id("api-generator-android") } - -android { - defaultConfig { - rootProject.extensions.add("pathToApiSchemes", "${AndroidConfig.COMMON_FOLDER}/api") - rootProject.extensions.add("applicationId", AndroidConfig.TEST_APP_ID) - } -} +// TODO: uncomment api generator +//apiGenerator { +// pathToApiSchemes = "${AndroidConfig.COMMON_FOLDER}/api" +// outputPackageName = AndroidConfig.TEST_APP_ID +// outputLanguage = apigen.OutputLanguage.KotlinAndroid( +// methodOutputType = apigen.MethodOutputType.Coroutine +// ) +//} dependencies { retrofit() dagger() moshi() coroutines() - //TODO: fix api gen and remove joda - implementation(Library.JODA) } - -//apply(from = "${rootProject.extra["buildScriptsDir"]}/gradle/apiGenerator.gradle") diff --git a/settings.gradle.kts b/settings.gradle.kts index bb21058..bedbcee 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -22,6 +22,7 @@ val roboswagModules = listOf( "kotlin-extensions" ) +includeBuild("BuildScripts/gradle/plugins") roboswagModules.forEach { module -> include(":$module") project(":$module").projectDir = file("RoboSwag/$module")