Skip to content

Commit

Permalink
🆙AGP
Browse files Browse the repository at this point in the history
  • Loading branch information
ohmae committed Aug 1, 2021
1 parent 75b9951 commit 25eea4b
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 44 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/local.properties
/.idea/caches
/.idea/copyright
/.idea/deploymentTargetDropDown.xml
/.idea/dictionaries
/.idea/libraries
/.idea/encodings.xml
Expand Down
16 changes: 0 additions & 16 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions .idea/runConfigurations.xml

This file was deleted.

28 changes: 16 additions & 12 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ val versionMinor = 0
val versionPatch = 1

android {
compileSdkVersion(30)
compileSdk = 30

defaultConfig {
applicationId = "net.mm2d.droidkaigi2018sample"
minSdkVersion(16)
targetSdkVersion(30)
minSdk = 16
targetSdk = 30
versionCode = versionMajor * 10000 + versionMinor * 100 + versionPatch
versionName = "${versionMajor}.${versionMinor}.${versionPatch}"
base.archivesBaseName = "${applicationName}-${versionName}"
Expand All @@ -37,30 +37,34 @@ android {
isDebuggable = true
applicationIdSuffix = ".debug"
versionNameSuffix = "d"
manifestPlaceholders(mapOf("app_name" to "D:DroidKaigi2018Sample"))
addManifestPlaceholders(mapOf("app_name" to "D:DroidKaigi2018Sample"))
}
getByName("release") {
isShrinkResources = true
isMinifyEnabled = true
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
manifestPlaceholders(mapOf("app_name" to "@string/app_name"))
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
addManifestPlaceholders(mapOf("app_name" to "@string/app_name"))
}
}
applicationVariants.all {
if (buildType.name == "release") {
outputs.all {
(this as BaseVariantOutputImpl).outputFileName = "${applicationName}-${versionName}.apk"
(this as BaseVariantOutputImpl).outputFileName =
"${applicationName}-${versionName}.apk"
}
}
}
}

dependencies {
implementation("androidx.core:core-ktx:1.3.2")
implementation("androidx.appcompat:appcompat:1.2.0")
implementation("androidx.recyclerview:recyclerview:1.2.0")
implementation("com.google.android.material:material:1.3.0")
implementation("androidx.constraintlayout:constraintlayout:2.0.4")
implementation("androidx.core:core-ktx:1.6.0")
implementation("androidx.appcompat:appcompat:1.3.1")
implementation("androidx.recyclerview:recyclerview:1.2.1")
implementation("com.google.android.material:material:1.4.0")
implementation("androidx.constraintlayout:constraintlayout:2.1.0")
testImplementation("junit:junit:4.13.2")
}

Expand Down
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ buildscript {
gradlePluginPortal()
}
dependencies {
classpath("com.android.tools.build:gradle:4.2.1")
classpath(kotlin("gradle-plugin", version = "1.5.0"))
classpath("com.github.ben-manes:gradle-versions-plugin:0.38.0")
classpath("com.android.tools.build:gradle:7.0.0")
classpath(kotlin("gradle-plugin", version = "1.5.21"))
classpath("com.github.ben-manes:gradle-versions-plugin:0.39.0")
}
}

Expand Down
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,5 @@ org.gradle.parallel=true
org.gradle.configureondemand=false
org.gradle.caching=true
kotlin.code.style=official
android.enableBuildCache=true
android.useAndroidX=true
android.enableJetifier=true
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ case "`uname`" in
Darwin* )
darwin=true
;;
MINGW* )
MSYS* | MINGW* )
msys=true
;;
NONSTOP* )
Expand Down

0 comments on commit 25eea4b

Please sign in to comment.