Skip to content

Commit 1f0d8db

Browse files
authored
Merge pull request #62 from skydoves/reafactor/buildSrc
Introduce buildSrc and update spotless licenses for other formats
2 parents c2b6dc8 + ec67e2b commit 1f0d8db

File tree

74 files changed

+384
-255
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+384
-255
lines changed

app/build.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import com.skydoves.pokedex.Configuration
2+
13
///*
24
// * Designed and developed by 2020 skydoves (Jaewoong Eum)
35
// *
@@ -22,13 +24,13 @@ apply plugin: 'dagger.hilt.android.plugin'
2224
apply from: "$rootDir/dependencies.gradle"
2325

2426
android {
25-
compileSdkVersion versions.compileSdk
27+
compileSdkVersion Configuration.compileSdk
2628
defaultConfig {
2729
applicationId "com.skydoves.pokedex"
28-
minSdkVersion versions.minSdk
29-
targetSdkVersion versions.compileSdk
30-
versionCode versions.versionCode
31-
versionName versions.versionName
30+
minSdkVersion Configuration.minSdk
31+
targetSdkVersion Configuration.compileSdk
32+
versionCode Configuration.versionCode
33+
versionName Configuration.versionName
3234
vectorDrawables.useSupportLibrary = true
3335
testInstrumentationRunner "com.skydoves.pokedex.AppTestRunner"
3436
javaCompileOptions {
@@ -170,4 +172,4 @@ dependencies {
170172
androidTestImplementation "androidx.test.espresso:espresso-core:$versions.espressoVersion"
171173
}
172174

173-
apply from: "$rootDir/spotless.gradle"
175+
apply from: "$rootDir/spotless/spotless.gradle"

app/src/androidTest/java/com/skydoves/pokedex/AppTestRunner.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
16+
1717
package com.skydoves.pokedex
1818

1919
import android.app.Application

app/src/androidTest/java/com/skydoves/pokedex/DetailActivityInjectionTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
16+
1717
package com.skydoves.pokedex
1818

1919
import android.content.Intent

app/src/androidTest/java/com/skydoves/pokedex/MainActivityInjectionTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
16+
1717
package com.skydoves.pokedex
1818

1919
import androidx.lifecycle.Lifecycle

app/src/main/AndroidManifest.xml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
<?xml version="1.0" encoding="utf-8"?><!--
2-
Designed and developed by 2020 skydoves (Jaewoong Eum)
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Designed and developed by 2020 skydoves (Jaewoong Eum)
34
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
78
8-
http://www.apache.org/licenses/LICENSE-2.0
9+
http://www.apache.org/licenses/LICENSE-2.0
910
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License. -->
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
1517
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
1618
xmlns:tools="http://schemas.android.com/tools"
1719
package="com.skydoves.pokedex">

app/src/main/java/com/skydoves/pokedex/PokedexApp.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
16+
1717
package com.skydoves.pokedex
1818

1919
import android.app.Application

app/src/main/java/com/skydoves/pokedex/binding/RecyclerViewBinding.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
16+
1717
package com.skydoves.pokedex.binding
1818

1919
import androidx.databinding.BindingAdapter

app/src/main/java/com/skydoves/pokedex/binding/ViewBinding.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
16+
1717
package com.skydoves.pokedex.binding
1818

1919
import android.graphics.Color

app/src/main/java/com/skydoves/pokedex/di/DispatcherModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
16+
1717
package com.skydoves.pokedex.di
1818

1919
import dagger.Module

app/src/main/java/com/skydoves/pokedex/di/NetworkModule.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
16+
1717
package com.skydoves.pokedex.di
1818

1919
import com.skydoves.pokedex.network.HttpRequestInterceptor

0 commit comments

Comments
 (0)