Skip to content

Commit 041b658

Browse files
authored
Merge pull request #126 from line/fix_buildConfig_error
Fix error due to missing BuildConfig
2 parents acd6d2a + 2315f4a commit 041b658

File tree

6 files changed

+21
-14
lines changed

6 files changed

+21
-14
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ example/ios/Flutter/Flutter.podspec
1717
/pubspec.lock
1818
ios/flutter_line_sdk/.build/
1919
.swiftpm/
20+
21+
**/.cxx/

android/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
group 'com.linecorp.flutter_line_sdk'
2-
version '1.0-SNAPSHOT'
32

43
buildscript {
54
ext.kotlin_version = '1.7.21'
@@ -12,7 +11,6 @@ buildscript {
1211
classpath 'com.android.tools.build:gradle:7.3.1'
1312
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1413
}
15-
1614
}
1715

1816
rootProject.allprojects {
@@ -39,10 +37,12 @@ android {
3937
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4038
consumerProguardFiles 'consumer-proguard-rules.pro'
4139
}
40+
buildFeatures {
41+
buildConfig true
42+
}
4243
lintOptions {
4344
disable 'InvalidPackage'
4445
}
45-
4646
compileOptions {
4747
sourceCompatibility JavaVersion.VERSION_1_8
4848
targetCompatibility JavaVersion.VERSION_1_8
@@ -54,7 +54,7 @@ android {
5454
}
5555

5656
dependencies {
57-
implementation('com.linecorp.linesdk:linesdk:5.9.1') {
57+
implementation('com.linecorp.linesdk:linesdk:5.11.0') {
5858
exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel-ktx'
5959
exclude group: 'androidx.lifecycle', module: 'lifecycle-extensions'
6060
}

android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
org.gradle.jvmargs=-Xmx1536M
22
android.enableR8=true
33
android.useAndroidX=true
4-
android.enableJetifier=true
4+
android.enableJetifier=false

example/android/app/build.gradle

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ if (localPropertiesFile.exists()) {
1212
}
1313
}
1414

15-
1615
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1716
if (flutterVersionCode == null) {
1817
flutterVersionCode = '1'
@@ -23,11 +22,9 @@ if (flutterVersionName == null) {
2322
flutterVersionName = '1.0'
2423
}
2524

26-
27-
2825
android {
2926
namespace 'com.linecorp.linesdk.sample'
30-
compileSdk 34
27+
compileSdk 35
3128

3229
sourceSets {
3330
main.java.srcDirs += 'src/main/kotlin'
@@ -40,7 +37,7 @@ android {
4037
defaultConfig {
4138
applicationId "com.linecorp.linesdk.sample"
4239
minSdk 24
43-
targetSdk 31
40+
targetSdk 35
4441
versionCode flutterVersionCode.toInteger()
4542
versionName flutterVersionName
4643
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -63,6 +60,11 @@ android {
6360
}
6461
release {
6562
minifyEnabled true
63+
shrinkResources true
64+
proguardFiles(
65+
getDefaultProguardFile("proguard-android-optimize.txt"),
66+
"proguard-rules.pro"
67+
)
6668
signingConfig signingConfigs.debug
6769
}
6870
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
-keepattributes SourceFile,LineNumberTable
2+
-renamesourcefileattribute SourceFile
3+
-dontwarn com.linecorp.linesdk.BR

example/android/gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
org.gradle.jvmargs=-Xmx1536M
22
android.useAndroidX=true
3-
android.enableJetifier=true
4-
android.defaults.buildfeatures.buildconfig=true
5-
android.nonTransitiveRClass=false
6-
android.nonFinalResIds=false
3+
android.enableJetifier=false
4+
android.nonTransitiveRClass=true
5+
android.nonFinalResIds=true
6+
android.enableR8.fullMode=true

0 commit comments

Comments
 (0)