Skip to content

Commit

Permalink
Fix/for editor (#213)
Browse files Browse the repository at this point in the history
* update agp, gradle, targetSdk

* fix: dependencies

* add test_lib module

* fix changelog

* add updated agp suppport comment
  • Loading branch information
wasnot authored Feb 21, 2023
1 parent 975d6a9 commit 9b43b90
Show file tree
Hide file tree
Showing 93 changed files with 851 additions and 564 deletions.
4 changes: 2 additions & 2 deletions .idea/codeStyles/Project.xml

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

6 changes: 6 additions & 0 deletions .idea/compiler.xml

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

5 changes: 5 additions & 0 deletions .idea/jarRepositories.xml

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

2 changes: 1 addition & 1 deletion .idea/misc.xml

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

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

This file was deleted.

20 changes: 11 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,6 @@
| visualtracking | ビジュアルトラッキング機能を提供します。| 2.7.1 |
| Karte Gradle Plugin | ビジュアルトラッキング機能に必要なプラグインです。| 2.5.0 |

# Releases - 2022.11.18

### Karte Gradle Plugin 2.5.0
** 💊FIXED **
- Android Gradle Plugin 8.0以降に対応しました。
- `androidx.navigation`ライブラリを参照しているとビルドできない不具合を修正しました。([issue](https://github.com/plaidev/karte-android-sdk/issues/19))
- 解消するにはAndroid Gradle Pluginを7.0.0以降にする必要があります。
- Kotlin 1.7.20 で一部の操作ログが送信されない不具合を修正しました。

# Releases - xxxx.xx.xx

### Core 2.21.0
Expand All @@ -31,6 +22,17 @@
** 🔨CHANGED**
- 効果測定用のイベントにフィールドを追加しました。

# Releases - 2022.11.18

### Karte Gradle Plugin 2.5.0
** 💊FIXED **
- Android Gradle Plugin 8.0以降に対応しました。
- `androidx.navigation`ライブラリを参照しているとビルドできない不具合を修正しました。([issue](https://github.com/plaidev/karte-android-sdk/issues/19))
- 解消するにはAndroid Gradle Pluginを7.0.0以降にする必要があります。
- Kotlin 1.7.20 で一部の操作ログが送信されない不具合を修正しました。
** 🔨CHANGED**
- Android Gradle Plugin 3.6.0未満は非対応となりました。

# Releases - 2022.09.09

### Notifications 2.9.1
Expand Down
7 changes: 4 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ buildscript {
ext.kotlin_version = '1.3.50'
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.0'
classpath 'com.android.tools.build:gradle:7.0.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.4.20"

Expand All @@ -23,11 +23,12 @@ buildscript {
allprojects {
repositories {
google()
mavenCentral()
jcenter()
}
}

configure(subprojects.findAll { !it.name.startsWith("sample_") }) {
configure(subprojects.findAll { !it.name.startsWith("sample_") && !it.name.startsWith("test") }) {
println "configure libraries: ${project.name}"

apply from: '../buildscripts/projectDokka.gradle'
Expand Down
21 changes: 7 additions & 14 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

android {
namespace 'io.karte.android'
compileSdkVersion 29

defaultConfig {
minSdkVersion 16
//noinspection OldTargetApi
targetSdkVersion 29
versionName version
buildConfigField "String", "LIB_VERSION", "\"$version\""

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -21,10 +21,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
lintOptions {
warningsAsErrors true
lintConfig file('../lint.xml')
}

testOptions {
unitTests {
includeAndroidResources = true
Expand All @@ -34,7 +31,10 @@ android {
}
}
kotlinOptions.allWarningsAsErrors = true
testOptions.unitTests.includeAndroidResources = true
lint {
lintConfig file('../lint.xml')
warningsAsErrors true
}
}

dependencies {
Expand All @@ -51,16 +51,9 @@ dependencies {
testImplementation "org.robolectric:robolectric:4.8"
testImplementation 'com.squareup.okhttp3:mockwebserver:4.8.0'
testImplementation 'com.google.android.gms:play-services-ads-identifier:17.0.0'
testImplementation project(':test_lib')
}

task testJar(type: Jar, dependsOn: "assembleDebugUnitTest") {
classifier = 'test'
from 'build/tmp/kotlin-classes/debugUnitTest'
}

configurations.maybeCreate('testRuntime')
artifacts.add('testRuntime', testJar)

afterEvaluate {
if (rootProject.hasProperty("afterConfigurate")) {
rootProject."afterConfigurate"(project)
Expand Down
3 changes: 1 addition & 2 deletions core/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.karte.android" >
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
Expand Down
215 changes: 0 additions & 215 deletions core/src/test/java/io/karte/android/TestUtils.kt

This file was deleted.

Loading

0 comments on commit 9b43b90

Please sign in to comment.