From 8b7ef457359052c7e8b34294af2d3a024c202411 Mon Sep 17 00:00:00 2001 From: James Barr Date: Wed, 3 Apr 2024 19:15:25 -0700 Subject: [PATCH] Update to Android tools v30.3.0 (#988) * Update to Android Tools v30.0.3 * Update to Kotlin v1.5 * Remove kotlin android extensions * Force correct kotlinx metadata version with added dependency * Fix FileUtils method removal * Turn off Dagger lints since causing crashes --- build.gradle | 5 +++++ .../okbuck/extension/KotlinExtension.java | 4 ++-- .../util/manifest/manifest-merger-cli.jar | Bin 5251 -> 5208 bytes dependencies.gradle | 5 +++-- .../uber/okbuck/transform/DummyTransform.java | 20 ++++++++++++++++-- kotlin-app/build.gradle | 9 +++++++- .../com/uber/okbuck/example/MainActivity.kt | 6 +++++- libraries/kotlinlibrary/build.gradle | 1 + manifest-merger-cli/build.gradle | 2 +- .../okbuck/manifmerger/ManifestMergerCli.java | 4 ++-- 10 files changed, 45 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 280770caa..267d328a1 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,11 @@ allprojects { project -> } configurations.all { exclude group:"com.android.tools.build", module: "transform-api" + resolutionStrategy.eachDependency { DependencyResolveDetails details -> + if (details.requested.group == 'org.jetbrains.kotlin') { + details.useVersion deps.versions.kotlin + } + } resolutionStrategy { force deps.build.bcprov force deps.build.commonsCompress diff --git a/buildSrc/src/main/java/com/uber/okbuck/extension/KotlinExtension.java b/buildSrc/src/main/java/com/uber/okbuck/extension/KotlinExtension.java index e7b4044e1..8d2b45f4c 100644 --- a/buildSrc/src/main/java/com/uber/okbuck/extension/KotlinExtension.java +++ b/buildSrc/src/main/java/com/uber/okbuck/extension/KotlinExtension.java @@ -13,8 +13,8 @@ public class KotlinExtension { @Nullable public String compilerZipSha256; KotlinExtension(Project project) { - this.version = "1.4.10"; - this.compilerZipSha256 = "bb1a21d70e521a01ae104e99a082a6e7bb58699b86347049da521d175d0dace7"; + this.version = "1.5.31"; + this.compilerZipSha256 = "661111286f3e5ac06aaf3a9403d869d9a96a176b62b141814be626a47249fe9e"; } @Internal diff --git a/buildSrc/src/main/resources/com/uber/okbuck/core/util/manifest/manifest-merger-cli.jar b/buildSrc/src/main/resources/com/uber/okbuck/core/util/manifest/manifest-merger-cli.jar index ab5b4f080372842b086892342bd19a03fea7d072..8056d494f163ed629271d938561fa23fdef0b70d 100644 GIT binary patch literal 5208 zcmai&cQ{<#+Qt#V3?X_aT8Jp4jS(d31f#_uqnFXUXcL5Z_2>knlW0*#A0-hYqYDwe z8zK@!FClXH&i9>@@4epho@ej1_TJZZ-}kfD{%c)7UDy?3AOQgx89{|jD1zXkh%Tp# z0$dC&ReeQab#18V6$0IV39E@i5j`i;YR@hN6BmQ-ccGS|wmMW5t}mhmb&Xe~?7VSZ z^@w*igq)&AcGPvQRFM%JXQBaB?o&`+IxjMyWe{2W^~)UU=x%}KWdezSj}0Yv-!j`v zYfS=a)jm_dq!>jH@;YYG;{2jNF&dms$@EWU*hPljUDr1qo>_Ue@}_RNiIG#`jOVMU z&ATbu7KJ(=vV_E!irDNblgAb1=8P6)fGBe;2wtTl*lL|5nfT7kXDKH%B{H+eh|)(QC~yo+;|0Ne(Xofy96DYF*~odUzWNkUr)}p$(q~pZOz)`aFm|e0ME^BByGA$b4l(8 zysQzL5udCGzV{(uZ~o}bssG++t3}%m!&BA$7oop?u&01KA|DRnjOwQ1J5$5SP|>yVEG5V@g}}vwgm8YgXVFZ*^gDHc+cf8zxIA)f z9*`)Q3vVxeu7|VeMSXZz`fGZSE?5NbE_ZBlmP2q7u!FLY3*uTzcN^#;m7Q(t6G(xlADrce^e*tO}iPg6@)PwUz2@ZXK9 zB%;zzTrRMZoYmrSC`7TZ-V}{H9A;v9vv_#9`VGVTFB? zV_KsQEs@2;6d87X-f^0BHoN_jCdD%1^nLog@R~)ZDosA|!4$_gmR2E}|kfhrtzv&m3jnB zUAdE@+qjRIwX3J3u&EQOZUA{P!4fUV!%S|lMfKG+8beKskgN;uO&AIZ166PpTs`{a z;0mtR%W@<>Kn30?8zYvfy1#GP2@1!`=zeZ+PAXKO2S{gSK7I;nV@#kB=XN8MW(n9w z9NXoHnWd7b-|VDjh1;bpb*s8=O0q@q?|&f~br>BaM&{bD>&Jv^^04*2`Y_MWG!ZM5 zTh2rMS~cc*mT+$=2h7IV)g@x>Ys<#L62tkh6ORMC)dc7u-zoy7=dSboD?$^k8`JG$ zxH22^cqN3da$<%;LX78$slf2`%>kBK#g2+qDFb6jvg83pQy6`^fzI?C!$42;Q?XVl z6KSCyv=FNSzc(DoX?a~0O_%s+{s?5?fo=Z*;&S>BM8H)L~0b`L6O+LJ?6PhF$+ERHE zwC+)53F|ON1Kr+j(xeLNLt%gv(Trcb#>K;rjJZZM!uuRkmFOXT=RSa{46;hY(&REa zV`b;5xgUbjivl8srJ3W@xT87KREqmbO48W1}l%Zzs0A*>}yjouNHt4-A^4S4i8p1+9t!AoST+;Ld)a5`U_%Qs?Lyc-M z)geVm`lH>|9F$ha?c=mR+?RQ+cCMQ}g3_N-^RqJa=H99gZxpPLYlL~HD9H+K8bW7i zNL|Eyne7sygh(eC<9QaIhAS83VBrWjywnIGq1FHlR~g%{uD9)b z=8?%@UEK~wDhKGqeTychy`_h*go@MXW%)ETwiQ1zfmNwxv7zPxl_Pzo(2*=4f?4Lc}l12 zPnD!cg@NpaCNgW7L~7yECKg9Vvt-5Dx;tusc9kYiuz(2V`e1Kb+7`51vzFPtq%tkQ zlfyP~W19|VIU%FsC*aLLCp;n#oP!zA%#{pZ+0R$9D6Ur9PgJ5B<)M);8|Lzll}%?$ zMYHAwW#SEQj=lo6Fse^pas`uy~gtbyl!W@XuP- z&5E=ZHL2F(IWWh$Y8ntX0}S$UhTHxuYl-ONZfI#Nt5TcOH@7e`Yb{o*tf;OoUl^kN zJk*G3F<`=~%@wIG-}ye|RT8Q@C+I{h8{gy2{YtfSpt2^W`?Jvw2jNK%ji1iSHPisf z7cXygE5C}tA*jS(m!9KXt|ZacFapCoMq7Tc!tFEGI!-YJ|mXitMDf&RXI78I~EIBE2SGe%F+b= zH;lw|n__PJXmgQ_=E`PFZDfs*+|9D2XkifU*BCYG9}iDn;I1L8@2}9QsGOj>7Q|@uiYw<@xXwUd0cKW^t>dl*(xW;0%c0qzaNGRX zFo?55f$ohbjNhA!Q;(Y6Oryh6m^}?toTW9Z#M35XWc9`kKn`6rrlIJ(@><(h4r2o( zz6g1SPoqQ3@!|VFJ7rW`UfCVudp~2@W$s4(&0o?oLSxJGgpF zK0_KoEb)=QFJgGC_!jovPJ|8UXOVmFV!W}EJxlL_)r0G=n;G_;1;0(`SKWM0sTXyw zhRA~Qdi6pxUsinub{*|rqeSg5G7pVvqa-h>ocPlf$ap5ho74&GD&hTE4!)t zNM>r13HjC!vhWI6b@1)D#j3{XqS6m`gvwv`PZdZ`*^pBEgq6$&5N0>c?At3b$g+!_u29`%f6MzJY^U*o_;g)3YdXKk6-mm1c-OYTL(Fx$#@Z*%l z>v^*ZQF|tUgf8TKHa!2~<7I_E@=nH=iFr?66%r1|Kap#x;UwL77x3778)B!;$Y$o@ zt3ZiGdGG!zAHN0Qz%JH%Xxmi0rQ;HTJa5Z5}km2f}Q~%R>AMn7o1mc6SY`DU!Pdo3eErNhjMYWR^S_NC6zQ9NP;6jg3 z(2C5!q52vq+EF8?^t+NWDK5RXhgJGiu4H)MmmhpGy8&fK^Xtx{JMBD&;v=K2?V8`G z=}`q_g9gXrW7;3(Y`lfs{JPsaziE_wN2gPr6A~c{wQ9zD+2_KcFY)qg{`TyRo;{CH zqdAkkA$L-E_F3ZljFf^BXEe}5A|IVG(H{d0@$&l1Yo$0*3?-+v{9UN9NPh0_h=Q97uV|)&I5>$@ z`lFmn@wG{%gGuNNCdU_lQ@kdW(wcwnTHKa$A|;nfcRrld*K^sqVAP>Vx+ZJLis~mF z^$$MleZs?!_oGJLtv;5hK_c*m;|d?eST^HjAd3R;h2vRrC-C_%shecnIyd7DXO|qh z&EkJzyFE#_eB^rZRS!N5h&q?u^mAU#s_Tl2yHI}w7rjgY$S0EkJzgqT4ydi$eeD)G= ztcpe!EajX}9A`shWgPPsRRS14>>Bwp`{6knf4G^qG9K0Nw`Cg1rWu_+r``F9BH&1? z%}&_~Z3AbRH*NQ>l(-{~X9uz({n`gS@-RN_)|Hi(fmBNm%mebi4RXnmWSp?R_t4p< zw0Dv%3dlCu=FMG}tcJLEJv^zn!jls>aPUBcf!64a{kG8QSY$=V8oFIBaNvhr1S5j7 z33=OmMG9b17XxRR;oQ-D{tStJl*BHo(>cNC?Gc{nf#`%;+8YhJzk`Wb$|dAkg&`*y z(V|wb!|-Qk^5e#DpEX#ZI8ww@)?I1Rg5wQF$JX<#V)5JoRV7qEC|Cd&#|Umf+|@NM z8IiYx9%}`;q?O5-!G1fU7@YJC!$oP&k5xte2#*J_IWM5BC!EnYuvJGah!4)IO3h## zB1M}?)82uSfsg7)IPEm0dp%8ukLZgz9ZtF=Cv@x{fPA2a-nXnZ6IIL%-rA7 zUejO=N|1-5=zd-?60(T2Itz@8J7?D>uJ+x_i8Ba*)P&O#m$5(JzlRu zvdL0y%Nu?=%1Gh#Q2N1@_1!d0oN;MpLfPQ2jF+HjtItN8^ed>hhL9c9C2wEoUBD41i} zUcP&W>h=>!3jQx59QU_T_Yy`Ofbw-8k4SZ4ghX^#{xf*Gpc@x;onTY(^7$_e^}Fq_ zFw~{^vI;|PUCjTo{RX9ePxv$Fxr9Ogtjor$7q6Gt=kFYsXy~7H=>QP^28#a9b_t69 zZ4>|9_P^NZ@7$Nz=-+PZzi|H!k^Y?YXNdHFS%o3F|0U@^ASGScRg%jP(u=GABEpa6 G^6MXL{1tlu literal 5251 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 diff --git a/dependencies.gradle b/dependencies.gradle index 9eb628612..52aa6860f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -18,12 +18,12 @@ def exclude = { dep, String... excludes -> def versions = [ androidPlugin : "4.2.2", - androidTools : "30.0.2", + androidTools : "30.3.0", autovalue : "1.7.4", avro : "1.10.1", butterKnife : "10.2.3", dagger : "2.33", - kotlin : "1.4.10", + kotlin : "1.5.31", leakCanary : "2.6", rocker : "1.3.0", androidx : "1.1.0", @@ -88,6 +88,7 @@ def external = [ gson : "com.google.code.gson:gson:2.8.6", kotlinExtension : "org.jetbrains.kotlin:kotlin-android-extensions:${versions.kotlin}", kotlinStdlib : "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}", + kotlinMetadata : "org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.3.0", leakCanary : "com.squareup.leakcanary:leakcanary-android:${versions.leakCanary}", sqldelight : "com.squareup.sqldelight:android-driver:${versions.sqldelight}", rxandroid : "io.reactivex.rxjava2:rxandroid:2.1.1", diff --git a/dummy-transform/src/main/java/com/uber/okbuck/transform/DummyTransform.java b/dummy-transform/src/main/java/com/uber/okbuck/transform/DummyTransform.java index 1f9b1ca59..78ca6fa50 100644 --- a/dummy-transform/src/main/java/com/uber/okbuck/transform/DummyTransform.java +++ b/dummy-transform/src/main/java/com/uber/okbuck/transform/DummyTransform.java @@ -87,7 +87,7 @@ public void transform(TransformInvocation transformInvocation) File inputFile = changedInput.getKey(); File outputFile = - new File(outputDir, FileUtils.relativePossiblyNonExistingPath(inputFile, inputDir)); + new File(outputDir, relativePossiblyNonExistingPath(inputFile, inputDir)); switch (changedInput.getValue()) { case REMOVED: @@ -107,11 +107,27 @@ public void transform(TransformInvocation transformInvocation) Iterable files = FileUtils.getAllFiles(inputDir); for (File inputFile : files) { - File outputFile = new File(outputDir, FileUtils.relativePath(inputFile, inputDir)); + File outputFile = new File(outputDir, relativePath(inputFile, inputDir)); FileUtils.copyFile(inputFile, outputFile); } } } } } + + private static String relativePath(File file, File dir) { + return relativePossiblyNonExistingPath(file, dir); + } + + private static String relativePossiblyNonExistingPath(File file, File dir) { + String path = dir.toURI().relativize(file.toURI()).getPath(); + return toSystemDependentPath(path); + } + + private static String toSystemDependentPath(String path) { + if (File.separatorChar != '/') { + path = path.replace('/', File.separatorChar); + } + return path; + } } diff --git a/kotlin-app/build.gradle b/kotlin-app/build.gradle index bfbc4b998..13c84f1e1 100644 --- a/kotlin-app/build.gradle +++ b/kotlin-app/build.gradle @@ -3,7 +3,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile apply plugin: "com.android.application" apply plugin: "com.squareup.sqldelight" apply plugin: "kotlin-android" -apply plugin: "kotlin-android-extensions" apply plugin: "kotlin-kapt" android { @@ -13,6 +12,14 @@ android { } flavorDimensions "default" + + lintOptions { + // Turn off Dagger lints + disable "JvmStaticProvidesInObjectDetector" + disable "FieldSiteTargetOnQualifierAnnotation" + disable "ModuleCompanionObjects" + disable "ModuleCompanionObjectsNotInModuleParent" + } } tasks.withType(KotlinCompile).all { diff --git a/kotlin-app/src/main/java/com/uber/okbuck/example/MainActivity.kt b/kotlin-app/src/main/java/com/uber/okbuck/example/MainActivity.kt index 566dbd5be..51d7ff281 100644 --- a/kotlin-app/src/main/java/com/uber/okbuck/example/MainActivity.kt +++ b/kotlin-app/src/main/java/com/uber/okbuck/example/MainActivity.kt @@ -2,9 +2,10 @@ package com.uber.okbuck.example import android.os.Bundle import android.widget.Toast +import androidx.appcompat.widget.Toolbar +import com.google.android.material.floatingactionbutton.FloatingActionButton import com.uber.okbuck.example.sqldelightmodel.GithubRepo import dagger.android.support.DaggerAppCompatActivity -import kotlinx.android.synthetic.main.activity_main.* import javax.inject.Inject class MainActivity : DaggerAppCompatActivity() { @@ -12,6 +13,9 @@ class MainActivity : DaggerAppCompatActivity() { @Inject lateinit var analytics: Analytics + private val fab by lazy { findViewById(R.id.fab) } + private val toolbar by lazy { findViewById(R.id.toolbar) } + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) diff --git a/libraries/kotlinlibrary/build.gradle b/libraries/kotlinlibrary/build.gradle index c03bc09aa..e4f4e2dcc 100644 --- a/libraries/kotlinlibrary/build.gradle +++ b/libraries/kotlinlibrary/build.gradle @@ -8,6 +8,7 @@ dependencies { implementation deps.external.kotlinStdlib implementation deps.external.dagger + implementation deps.external.kotlinMetadata kapt deps.apt.daggerCompiler kaptTest deps.apt.daggerCompiler testImplementation deps.test.junit diff --git a/manifest-merger-cli/build.gradle b/manifest-merger-cli/build.gradle index 13a3b3dfe..71dffc817 100644 --- a/manifest-merger-cli/build.gradle +++ b/manifest-merger-cli/build.gradle @@ -4,7 +4,7 @@ evaluationDependsOn(pluginProjectPath) apply plugin: "application" group = "com.uber.okbuck.transform" -version = "1.0.0" +version = "1.0.1" tasks.withType(JavaCompile) { sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/manifest-merger-cli/src/main/java/com/uber/okbuck/manifmerger/ManifestMergerCli.java b/manifest-merger-cli/src/main/java/com/uber/okbuck/manifmerger/ManifestMergerCli.java index 2db25060e..353cb94b7 100644 --- a/manifest-merger-cli/src/main/java/com/uber/okbuck/manifmerger/ManifestMergerCli.java +++ b/manifest-merger-cli/src/main/java/com/uber/okbuck/manifmerger/ManifestMergerCli.java @@ -120,7 +120,7 @@ private static int process(String[] args) throws FileNotFoundException { "Invalid property name " + value.substring(0, value.indexOf('=')) + ", allowed properties are : " - + Joiner.on(',').join(ManifestSystemProperty.values())); + + Joiner.on(',').join(ManifestSystemProperty.getValues())); return 1; } } @@ -184,7 +184,7 @@ private static void usage() { System.out.println("\t--libs [path separated list of lib's manifests]"); System.out.println("\t--overlays [path separated list of overlay's manifests]"); System.out.println( - "\t--property [" + Joiner.on(" | ").join(ManifestSystemProperty.values()) + "=value]"); + "\t--property [" + Joiner.on(" | ").join(ManifestSystemProperty.getValues()) + "=value]"); System.out.println("\t--placeholder [name=value]"); System.out.println("\t--out [path of the output file]"); }