Skip to content
This repository was archived by the owner on Dec 18, 2023. It is now read-only.

Configurable versions for gradle/kotlin/android plugin - #41

Merged
borisf merged 1 commit into
android:masterfrom
jmfayard:updates
Nov 30, 2017
Merged

Configurable versions for gradle/kotlin/android plugin#41
borisf merged 1 commit into
android:masterfrom
jmfayard:updates

Conversation

@jmfayard

@jmfayard jmfayard commented Nov 28, 2017

Copy link
Copy Markdown

Hello, I wanted to fix indentation & update to Kotlin 1.1.60 ; android.gradle 3.0.1
In the meantime, I fixed the unit tests and clarified the main class


Update: the PR adds three parameters to the config

{
  "gradleVersion": "4.3.1",
  "androidGradlePluginVersion": "3.0.1",
  "kotlinVersion": "1.1.60",
}

@borisf

borisf commented Nov 28, 2017

Copy link
Copy Markdown
Contributor

Hi @jmfayard thanks, can you resolve the conflicts so we can merge it

@jmfayard

Copy link
Copy Markdown
Author

@borisf done

"buildscript {\n" +
(if (useKotlin)
" ext.kotlin_version = '1.1.51'\n"
else "")+

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed it because it's already defined in the top build.gradle
no need to update it to a wrong version

Comment thread SampleConfig.json Outdated
{
"projectName": "gennyCLI",
"root": "./modules/",
"androidGradleVersion": "3.0.1",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please name it "androidGradlePluginVersion"

Comment thread src/main/assets/build.gradle Outdated
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.android.tools.build:gradle:3.0.1'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Problem with customizing AGP version it that it is hardcoded here.

@jmfayard jmfayard Nov 28, 2017

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this file used?
if I set androidGradlePluginVersion to 3.0.0 I have only one reference as expected

$ egrep -ir 'com.android.tools.build:gradle' modules/gennyCLI
./build.gradle:        classpath 'com.android.tools.build:gradle:3.0.0'

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file was copied directly to the project folder, but after b8d5368#diff-469f26b37acf957d7e037aa3fc78cd01 this file is no longer used, I should have removed it on the same commit.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I removed it

@NikitaKozlov

Copy link
Copy Markdown
Contributor

LGTM

@borisf

borisf commented Nov 30, 2017

Copy link
Copy Markdown
Contributor

@jmfayard can you please resolve conflicts for us to merge

New configurations available
  "gradleVersion": "4.3.1",
  "androidGradlePluginVersion": "3.0.1",
  "kotlinVersion": "1.1.60",

Update README

Refactor main class
@jmfayard

Copy link
Copy Markdown
Author

@borisf conflicts resolved

@jmfayard jmfayard changed the title Updates Configurable versions for gradle/kotlin/android plugin Nov 30, 2017
@borisf
borisf merged commit 1923fcc into android:master Nov 30, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants