Browse Source

migrate to kts:prepare step2 disambiguating function invocations and property assignment

dev-kts
andywu91 3 years ago
parent
commit
7b5a3a31dc
  1. 38
      app/build.gradle
  2. 10
      build.gradle
  3. 38
      lib/build.gradle
  4. 2
      settings.gradle

38
app/build.gradle

@ -1,39 +1,39 @@
plugins{
id "com.android.application"
id "kotlin-android"
plugins {
id("com.android.application")
id("kotlin-android")
}
android {
compileSdkVersion 28
compileSdkVersion = 28
defaultConfig {
applicationId "com.wuliang.xapkinstaller"
minSdkVersion 14
targetSdkVersion 28
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
applicationId = "com.wuliang.xapkinstaller"
minSdkVersion = 14
targetSdkVersion = 28
versionCode = 1
versionName = "1.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
minifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
buildToolsVersion = "28.0.3"
}
dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation(fileTree(dir: "libs", include: ["*.jar"]))
implementation "androidx.appcompat:appcompat:$rootProject.ext.appcompat_version"
implementation("androidx.appcompat:appcompat:$rootProject.ext.appcompat_version")
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
testImplementation "junit:junit:4.12"
implementation project(path: ":lib")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version")
testImplementation("junit:junit:4.12")
implementation(project(path: ":lib"))
implementation "com.liulishuo.okdownload:okdownload:1.0.7"
implementation("com.liulishuo.okdownload:okdownload:1.0.7")
}

10
build.gradle

@ -11,8 +11,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:3.6.0"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath("com.android.tools.build:gradle:3.6.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
@ -25,6 +25,6 @@ allprojects {
}
}
task clean(type: Delete) {
delete rootProject.buildDir
}
task(clean(type: Delete) {
delete = rootProject.buildDir
})

38
lib/build.gradle

@ -1,48 +1,48 @@
plugins{
id "com.android.library"
id "kotlin-android"
id "maven-publish"
id("com.android.library")
id("kotlin-android")
id("maven-publish")
}
group = "com.wuliang.lib"
version = "1.0.0"
android {
compileSdkVersion 28
compileSdkVersion = 28
defaultConfig {
minSdkVersion 14
targetSdkVersion 28
versionCode 1
versionName "1.0"
minSdkVersion = 14
targetSdkVersion = 28
versionCode = 1
versionName = "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
minifyEnabled = false
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
buildToolsVersion = "28.0.3"
}
dependencies {
implementation fileTree(dir: "libs", include: ["*.jar"])
implementation (fileTree(dir: "libs", include: ["*.jar"]))
implementation "androidx.appcompat:appcompat:$rootProject.ext.appcompat_version"
implementation( "androidx.appcompat:appcompat:$rootProject.ext.appcompat_version")
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
testImplementation "junit:junit:4.12"
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version")
testImplementation( "junit:junit:4.12")
implementation "org.zeroturnaround:zt-zip:1.13"
implementation("org.zeroturnaround:zt-zip:1.13")
}
// Because the components are created only during the afterEvaluate phase, you must
@ -53,7 +53,7 @@ afterEvaluate {
// Creates a Maven publication called "release".
release(MavenPublication) {
// Applies the component for the release build variant.
from components.release
from(components.release)
// You can then customize attributes of the publication as shown below.
artifactId = "xapkinstaller"

2
settings.gradle

@ -1,2 +1,2 @@
include ":app", ":lib"
include(":app", ":lib")
rootProject.name="XAPK Installer"

Loading…
Cancel
Save