successfuly add android project

This commit is contained in:
InsanusMokrassar 2020-11-10 14:32:50 +06:00
parent a739e874bf
commit 97dadf517a
8 changed files with 47 additions and 35 deletions

1
.gitignore vendored
View File

@ -10,5 +10,6 @@ build/
out/ out/
secret.gradle secret.gradle
local.properties
publishing.sh publishing.sh

View File

@ -1,18 +1,18 @@
buildscript { buildscript {
ext {
kotlin_version = '1.4.10'
}
repositories { repositories {
mavenLocal()
jcenter() jcenter()
google()
mavenCentral() mavenCentral()
mavenLocal()
maven { url "https://plugins.gradle.org/m2/" } maven { url "https://plugins.gradle.org/m2/" }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:4.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$gradle_bintray_plugin_version" classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$gradle_bintray_plugin_version"
classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:$dexcount_version"
classpath "com.github.breadmoirai:github-release:$github_release_plugin_version" classpath "com.github.breadmoirai:github-release:$github_release_plugin_version"
} }
} }
@ -22,6 +22,7 @@ allprojects {
mavenLocal() mavenLocal()
jcenter() jcenter()
mavenCentral() mavenCentral()
google()
maven { url "https://kotlin.bintray.com/kotlinx" } maven { url "https://kotlin.bintray.com/kotlinx" }
} }
} }

View File

@ -20,6 +20,7 @@ uuidVersion=0.2.2
# ANDROID # ANDROID
android_minSdkVersion=24
android_compileSdkVersion=30 android_compileSdkVersion=30
android_buildToolsVersion=30.0.2 android_buildToolsVersion=30.0.2
dexcount_version=2.0.0-RC1 dexcount_version=2.0.0-RC1

View File

@ -18,11 +18,35 @@ kotlin {
implementation kotlin('test-annotations-common') implementation kotlin('test-annotations-common')
} }
} }
}
jvmTest { }
dependencies {
implementation kotlin('test-junit') android {
} compileSdkVersion "$android_compileSdkVersion".toInteger()
} defaultConfig {
minSdkVersion "$android_minSdkVersion".toInteger()
targetSdkVersion "$android_compileSdkVersion".toInteger()
versionCode "${android_code_version}".toInteger()
versionName "$version"
}
buildTypes {
release {
minifyEnabled false
}
}
packagingOptions {
exclude 'META-INF/kotlinx-serialization-runtime.kotlin_module'
exclude 'META-INF/kotlinx-serialization-cbor.kotlin_module'
exclude 'META-INF/kotlinx-serialization-properties.kotlin_module'
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
} }
} }

View File

@ -0,0 +1,8 @@
plugins {
id "org.jetbrains.kotlin.multiplatform"
id "org.jetbrains.kotlin.plugin.serialization"
id "com.android.library"
id "kotlin-android-extensions"
}
apply from: "$mppAndroidProjectPresetPath"

View File

@ -1,24 +0,0 @@
buildscript {
repositories {
jcenter()
google()
mavenCentral()
mavenLocal()
maven { url "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:$dexcount_version"
}
}
plugins {
id "org.jetbrains.kotlin.multiplatform"
id "org.jetbrains.kotlin.plugin.serialization"
}
apply plugin: 'com.android.library'
apply from: "$mppAndroidProjectPresetPath"

View File

@ -0,0 +1 @@
<manifest package="dev.inmo.repos.android"/>

View File

@ -13,7 +13,7 @@ String[] includes = [
":repos:ktor:client", ":repos:ktor:client",
":repos:ktor:common", ":repos:ktor:common",
":repos:ktor:server", ":repos:ktor:server",
// ":repos:android:db", ":repos:android",
":ktor:server", ":ktor:server",
":ktor:common", ":ktor:common",
":ktor:client", ":ktor:client",