Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ example/ios/Flutter/Flutter.podspec
/pubspec.lock
ios/flutter_line_sdk/.build/
.swiftpm/

**/.cxx/
8 changes: 4 additions & 4 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
group 'com.linecorp.flutter_line_sdk'
version '1.0-SNAPSHOT'

buildscript {
ext.kotlin_version = '1.7.21'
Expand All @@ -12,7 +11,6 @@ buildscript {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}

}

rootProject.allprojects {
Expand All @@ -39,10 +37,12 @@ android {
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-proguard-rules.pro'
}
buildFeatures {
buildConfig true
}
lintOptions {
disable 'InvalidPackage'
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
Expand All @@ -54,7 +54,7 @@ android {
}

dependencies {
implementation('com.linecorp.linesdk:linesdk:5.9.1') {
implementation('com.linecorp.linesdk:linesdk:5.11.0') {
exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel-ktx'
exclude group: 'androidx.lifecycle', module: 'lifecycle-extensions'
}
Expand Down
2 changes: 1 addition & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx1536M
android.enableR8=true
android.useAndroidX=true
android.enableJetifier=true
android.enableJetifier=false
12 changes: 7 additions & 5 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ if (localPropertiesFile.exists()) {
}
}


def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
if (flutterVersionCode == null) {
flutterVersionCode = '1'
Expand All @@ -23,11 +22,9 @@ if (flutterVersionName == null) {
flutterVersionName = '1.0'
}



android {
namespace 'com.linecorp.linesdk.sample'
compileSdk 34
compileSdk 35

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
Expand All @@ -40,7 +37,7 @@ android {
defaultConfig {
applicationId "com.linecorp.linesdk.sample"
minSdk 24
targetSdk 31
targetSdk 35
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -63,6 +60,11 @@ android {
}
release {
minifyEnabled true
shrinkResources true
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
signingConfig signingConfigs.debug
}
}
Expand Down
3 changes: 3 additions & 0 deletions example/android/app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
-keepattributes SourceFile,LineNumberTable
-renamesourcefileattribute SourceFile
-dontwarn com.linecorp.linesdk.BR
8 changes: 4 additions & 4 deletions example/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
android.enableJetifier=false
android.nonTransitiveRClass=true
android.nonFinalResIds=true
android.enableR8.fullMode=true