Skip to content
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.

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

roll forward dependency versions; externalise some dep versions #631

Merged
merged 1 commit into from Sep 28, 2019

Conversation

micolous
Copy link
Collaborator

@micolous micolous commented Sep 22, 2019

Update some dependencies, and make versioning consistent again:

  • Kotlin 1.3.11 (jvmcli) / 1.3.41 (others) ▶️ 1.3.50 1.3.41 (consistently)
  • Android Gradle Plugin 3.2.1 (jvmcli) / 3.4.1 (others) ▶️ 3.4.1 (consistently)
  • Protobuf 3.0.1 ▶️ 3.9.1 (consistently); switched to new JavaLite configuration style used in Protobuf 3.8.0+
  • Protobuf Gradle Plugin 0.8.6 (jvmcli) / 0.8.8 (others) ▶️ 0.8.10 (consistently)

Removes duplicated definitions of buildscript.ext in jvmcli/build.gradle.

Some stuff here is still behind the current version -- the key things I was going for was making jvmcli/build.gradle consistent, and getting one of the illegal reflective access issues fixed (as seen here).

@micolous micolous added bug cleanup Paying back all the technical debt! labels Sep 22, 2019
@micolous micolous added this to the 3.0.0 milestone Sep 22, 2019
@micolous
Copy link
Collaborator Author

Looks like the new protobuf library has a compatibility issue on API <= 23: https://travis-ci.org/metrodroid/metrodroid/jobs/588019272#L1622-L1714

@micolous
Copy link
Collaborator Author

Ah, protobuf bug is protocolbuffers/protobuf#6551

@phcoder
Copy link
Collaborator

phcoder commented Sep 22, 2019

Please test it on iOS. I had some problems with kotlin 1.3.50 there

@micolous
Copy link
Collaborator Author

micolous commented Sep 22, 2019

Yup, I see the error. :(

> Task :cinteropStationsIOS FAILED
w: skipping ~/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-io-iosx64/0.1.9-1.3.40-eap-67/a56936f6af82195286e22098ba1ac88d78d77d10/kotlinx-io.klib. The abi versions don't match. Expected '[14]', found '9'
w: The compiler versions don't match either. Expected '[]', found '1.3-eap-10415'
e: Could not find "~/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-io-iosx64/0.1.9-1.3.40-eap-67/a56936f6af82195286e22098ba1ac88d78d77d10/kotlinx-io.klib" in [~/metrodroid, ~/.konan/klib, ~/.konan/kotlin-native-macos-1.3.50/klib/common, ~/.konan/kotlin-native-macos-1.3.50/klib/platform/ios_x64].

@micolous
Copy link
Collaborator Author

micolous commented Sep 22, 2019

I've rolled it back to Kotlin 1.3.41. This is now the same version as was used on iOS before, but still rolls forward jvmcli.

This still means that IOS version will have a newer protoc in use; but should now actually match the version pulled in the submodule. Still waiting for a build to complete locally for IOS.

@micolous micolous merged commit df262db into metrodroid:master Sep 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug cleanup Paying back all the technical debt!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants