diff --git a/.gitignore b/.gitignore index bc70b1e..e2cdf16 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ example/ios/Flutter/Flutter.podspec /pubspec.lock ios/flutter_line_sdk/.build/ .swiftpm/ + +**/.cxx/ \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index 5f90632..66dd3a2 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,4 @@ group 'com.linecorp.flutter_line_sdk' -version '1.0-SNAPSHOT' buildscript { ext.kotlin_version = '1.7.21' @@ -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 { @@ -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 @@ -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' } diff --git a/android/gradle.properties b/android/gradle.properties index 38c8d45..3dbac08 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx1536M android.enableR8=true android.useAndroidX=true -android.enableJetifier=true +android.enableJetifier=false diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle index aedee7c..c91c48e 100644 --- a/example/android/app/build.gradle +++ b/example/android/app/build.gradle @@ -12,7 +12,6 @@ if (localPropertiesFile.exists()) { } } - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '1' @@ -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' @@ -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" @@ -63,6 +60,11 @@ android { } release { minifyEnabled true + shrinkResources true + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) signingConfig signingConfigs.debug } } diff --git a/example/android/app/proguard-rules.pro b/example/android/app/proguard-rules.pro new file mode 100644 index 0000000..36f6ae0 --- /dev/null +++ b/example/android/app/proguard-rules.pro @@ -0,0 +1,3 @@ +-keepattributes SourceFile,LineNumberTable +-renamesourcefileattribute SourceFile +-dontwarn com.linecorp.linesdk.BR diff --git a/example/android/gradle.properties b/example/android/gradle.properties index b9a9a24..3174d96 100644 --- a/example/android/gradle.properties +++ b/example/android/gradle.properties @@ -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 \ No newline at end of file