Skip to content

Commit

Permalink
Update Android Project
Browse files Browse the repository at this point in the history
  • Loading branch information
shogo4405 committed May 5, 2020
1 parent 38da5bb commit 3256537
Show file tree
Hide file tree
Showing 7 changed files with 167 additions and 215 deletions.
167 changes: 58 additions & 109 deletions app/app.iml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.0'
classpath 'com.android.tools.build:gradle:3.6.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
Expand Down
1 change: 1 addition & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ org.gradle.jvmargs=-Xmx1536m
# This option should only be used with decoupled projects. More details, visit
# http:https://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true

4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat May 04 00:47:57 JST 2019
#Tue May 05 19:44:43 JST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\:https://services.gradle.org/distributions/gradle-5.1.1-all.zip
distributionUrl=https\:https://services.gradle.org/distributions/gradle-5.6.4-all.zip
48 changes: 47 additions & 1 deletion haishinkit/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
apply plugin: 'maven-publish'
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

version = '0.0.1'

task sourceJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
archiveClassifier.set("sources")
}

android {
compileSdkVersion 26
buildToolsVersion '26.0.2'
defaultConfig {
minSdkVersion 16
targetSdkVersion 26
versionCode 1
versionName "1.0"
versionName "0.0.1"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

Expand All @@ -34,6 +42,44 @@ dependencies {
testCompile 'junit:junit:4.12'
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}

repositories {
mavenCentral()
}

publishing {
repositories {
maven {
name = "HaishinKit.kt"
url = uri("https://maven.pkg.github.com/shogo4405/HaishinKit.kt")
credentials {
username = project.findProperty("gpr.user") ?: System.getenv("GITHUB_USER")
password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_API_TOKEN")
}
}
}
publications {
maven(MavenPublication) {
groupId "com.haishinkit"
artifactId "HaishinKit"
version "$version"
artifact sourceJar
artifact "$buildDir/outputs/aar/haishinkit-release.aar"
pom {
withXml {
def dependenciesNode = asNode().appendNode('dependencies')

project.configurations.implementation.allDependencies.each {
if (it.group != null || it.name != null || it.version != null || it.name == "unspecified") return

def dependencyNode = dependenciesNode.appendNode('dependency')
dependencyNode.appendNode('groupId', it.group)
dependencyNode.appendNode('artifactId', it.name)
dependencyNode.appendNode('version', it.version)
}
}
}
}
}
}

152 changes: 55 additions & 97 deletions haishinkit/haishinkit.iml

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions local.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
## This file is automatically generated by Android Studio.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
#
# This file should *NOT* be checked into Version Control Systems,
## This file must *NOT* be checked into Version Control Systems,
# as it contains information specific to your local configuration.
#
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
sdk.dir=/Users/shogo/Library/Android/sdk
#Tue May 05 20:36:54 JST 2020
sdk.dir=/Users/shogo.endo/Library/Android/sdk

0 comments on commit 3256537

Please sign in to comment.