Skip to content

Commit

Permalink
Merge pull request #10 from hyperskill/main
Browse files Browse the repository at this point in the history
update modules in hs-gradle-plugin for Android, Kotlin added Ktor
  • Loading branch information
meanmail authored Aug 14, 2023
2 parents 0d9923b + 18df706 commit c239a48
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 7 deletions.
11 changes: 8 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ To use the plugin, include in your build script:
```gradle
buildscript {
repositories {
maven { url 'https://packages.jetbrains.team/maven/p/hyperskill-hs-test/maven' }
maven { url 'https://jitpack.io' }
}
Expand All @@ -35,7 +36,7 @@ hs {
}
kotlin {
version = "1.6.10"
version = "1.8.20"
javaVersion = "17"
}
Expand All @@ -47,10 +48,14 @@ hs {
bootVersion = "3.0.2"
dependencyManagementVersion = "1.1.0"
}
ktor {
version = "2.3.1"
}
android {
androidGradleVersion = "7.0.2"
gradleVersion = "7.0.2"
androidGradleVersion = "7.4.0"
gradleVersion = "7.5"
kotlinGradleVersion = "1.6.10"
kotlinVersion = "1.6.10"
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ gradlePlugin {
}

group 'org.hyperskill'
version '1.2'
version '1.3'

publishing {
publications {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class HyperskillVersionExtension {
public Java java = new Java();
public Kotlin kotlin = new Kotlin();
public Spring spring = new Spring();
public Ktor ktor = new Ktor();

public HyperskillVersionExtension() {

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/hyperskill/plugin/versions/Android.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

public class Android {

private String androidGradleVersion = "7.0.2";
public String gradleVersion = "7.0.2";
private String androidGradleVersion = "7.4.0";
public String gradleVersion = "7.5";
public String kotlinGradleVersion = "1.6.10";
public String kotlinVersion = "1.6.10";

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/hyperskill/plugin/versions/Kotlin.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

public class Kotlin {

public String version = "1.6.10";
public String version = "1.8.20";
public String javaVersion = "17";

public Kotlin() {}
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/org/hyperskill/plugin/versions/Ktor.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package org.hyperskill.plugin.versions;

public class Ktor {

public String version = "2.3.1";

public Ktor() {
}
}

0 comments on commit c239a48

Please sign in to comment.