diff --git a/README.md b/README.md index b4116cf..69a0500 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ XMake installed on the system. Available [here](https://github.com/xmake-io/xmak ``` plugins { - id 'org.tboox.gradle-xmake-plugin' version '1.1.4' + id 'org.tboox.gradle-xmake-plugin' version '1.1.5' } ``` @@ -70,7 +70,7 @@ buildscript { } } dependencies { - classpath 'org.tboox:gradle-xmake-plugin:1.1.4' + classpath 'org.tboox:gradle-xmake-plugin:1.1.5' } repositories { mavenCentral() diff --git a/README_zh.md b/README_zh.md index 5d009b3..56b1c11 100644 --- a/README_zh.md +++ b/README_zh.md @@ -56,7 +56,7 @@ xmake-gradle是一个无缝整合xmake的gradle插件。 ``` plugins { - id 'org.tboox.gradle-xmake-plugin' version '1.1.4' + id 'org.tboox.gradle-xmake-plugin' version '1.1.5' } ``` @@ -70,7 +70,7 @@ buildscript { } } dependencies { - classpath 'org.tboox:gradle-xmake-plugin:1.1.4' + classpath 'org.tboox:gradle-xmake-plugin:1.1.5' } repositories { mavenCentral() diff --git a/build.gradle b/build.gradle index f59e8e2..d242673 100644 --- a/build.gradle +++ b/build.gradle @@ -4,13 +4,12 @@ buildscript { repositories { google() mavenCentral() - + } dependencies { - //classpath 'com.android.tools.build:gradle:3.5.2' - classpath "com.android.tools.build:gradle:7.0.0-alpha14" + classpath "com.android.tools.build:gradle:4.0.0" //classpath fileTree(dir: 'gradle-xmake-plugin/build/libs', include: ['*.jar']) - + // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -20,7 +19,7 @@ allprojects { repositories { google() mavenCentral() - + } } diff --git a/gradle-xmake-plugin/build.gradle b/gradle-xmake-plugin/build.gradle index 48620ea..b625d50 100644 --- a/gradle-xmake-plugin/build.gradle +++ b/gradle-xmake-plugin/build.gradle @@ -8,7 +8,7 @@ plugins { apply plugin: 'groovy' group = "org.tboox" -version = "1.1.4" +version = "1.1.5" repositories { // Use mavenCentral for resolving your dependencies. @@ -21,8 +21,7 @@ dependencies { implementation gradleApi() // Use JUnit test framework testImplementation 'junit:junit:4.12' - //compileOnly 'com.android.tools.build:gradle:3.5.3' - compileOnly "com.android.tools.build:gradle:7.0.0-alpha14" + compileOnly "com.android.tools.build:gradle:4.0.0" } gradlePlugin { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 120970d..39d8715 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -4,4 +4,4 @@ distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists #distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip diff --git a/nativelib/build.gradle b/nativelib/build.gradle index 67e478a..8ca82a6 100644 --- a/nativelib/build.gradle +++ b/nativelib/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.tboox.gradle-xmake-plugin' version '1.1.4' + id 'org.tboox.gradle-xmake-plugin' version '1.1.5' } apply plugin: 'com.android.library' //apply plugin: "org.tboox.gradle-xmake-plugin" @@ -52,7 +52,6 @@ android { path "jni/CMakeLists.txt" }*/ - xmake { //logLevel "verbose" path "jni/xmake.lua"