Skip to content

Commit 3c6496a

Browse files
authored
fix: java package version always 1.0.0, current parse version not pushed to server (#1130)
1 parent 1eeb9cf commit 3c6496a

File tree

15 files changed

+5011
-54
lines changed

15 files changed

+5011
-54
lines changed

.github/workflows/release-automated.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- uses: actions/setup-node@v2
3737
with:
3838
node-version: 14
39-
- run: npm install -g -E [email protected] @semantic-release/[email protected] @semantic-release/[email protected] @semantic-release/[email protected] @semantic-release/[email protected]
39+
- run: npm ci
4040
- run: npx semantic-release
4141
env:
4242
GH_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,3 @@ jacoco.exec
4545
# Node
4646
node_modules/
4747
npm-debug.log
48-
package-lock.json

coroutines/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,22 @@ android {
1010
defaultConfig {
1111
minSdkVersion rootProject.ext.minSdkVersion
1212
targetSdkVersion rootProject.ext.targetSdkVersion
13-
versionCode 1
14-
versionName "1.0"
15-
}
16-
17-
packagingOptions {
18-
exclude "**/BuildConfig.class"
1913
}
2014

2115
lintOptions {
2216
abortOnError false
2317
}
2418

2519
buildTypes {
20+
debug {
21+
testCoverageEnabled = true
22+
buildConfigField("String","PARSE_VERSION","\"${version}\"")
23+
}
2624
release {
2725
minifyEnabled false
26+
testCoverageEnabled = false
2827
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
28+
buildConfigField("String","PARSE_VERSION","\"${version}\"")
2929
}
3030
}
3131

facebook/build.gradle

+13-6
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,25 @@ android {
99
defaultConfig {
1010
minSdkVersion rootProject.ext.minSdkVersion
1111
targetSdkVersion rootProject.ext.targetSdkVersion
12-
versionCode 1
13-
versionName "1.0"
14-
}
15-
16-
packagingOptions {
17-
exclude "**/BuildConfig.class"
1812
}
1913

2014
lintOptions {
2115
abortOnError false
2216
}
2317

18+
buildTypes {
19+
debug {
20+
testCoverageEnabled = true
21+
buildConfigField("String","PARSE_VERSION","\"${version}\"")
22+
}
23+
release {
24+
minifyEnabled false
25+
testCoverageEnabled = false
26+
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
27+
buildConfigField("String","PARSE_VERSION","\"${version}\"")
28+
}
29+
}
30+
2431
compileOptions {
2532
sourceCompatibility JavaVersion.VERSION_1_8
2633
targetCompatibility JavaVersion.VERSION_1_8

fcm/build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ android {
99
defaultConfig {
1010
minSdkVersion rootProject.ext.minSdkVersion
1111
targetSdkVersion rootProject.ext.targetSdkVersion
12-
versionCode 1
13-
versionName "1.0"
14-
}
15-
16-
packagingOptions {
17-
exclude "**/BuildConfig.class"
1812
}
1913

2014
lintOptions {
2115
abortOnError false
2216
}
2317

2418
buildTypes {
19+
debug {
20+
testCoverageEnabled = true
21+
buildConfigField("String","PARSE_VERSION","\"${version}\"")
22+
}
2523
release {
2624
minifyEnabled false
25+
testCoverageEnabled = false
2726
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
27+
buildConfigField("String","PARSE_VERSION","\"${version}\"")
2828
}
2929
}
3030

google/build.gradle

+13-6
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@ android {
1010
defaultConfig {
1111
minSdkVersion rootProject.ext.minSdkVersion
1212
targetSdkVersion rootProject.ext.targetSdkVersion
13-
versionCode 1
14-
versionName "1.0"
15-
}
16-
17-
packagingOptions {
18-
exclude "**/BuildConfig.class"
1913
}
2014

2115
lintOptions {
@@ -27,6 +21,19 @@ android {
2721
targetCompatibility JavaVersion.VERSION_1_8
2822
}
2923

24+
buildTypes {
25+
debug {
26+
testCoverageEnabled = true
27+
buildConfigField("String","PARSE_VERSION","\"${version}\"")
28+
}
29+
release {
30+
minifyEnabled false
31+
testCoverageEnabled = false
32+
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
33+
buildConfigField("String","PARSE_VERSION","\"${version}\"")
34+
}
35+
}
36+
3037
kotlinOptions {
3138
jvmTarget = "1.8"
3239
}

gradle.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
version=2.0.2
12
android.enableJetifier=true
2-
android.useAndroidX=true
3+
android.useAndroidX=true

ktx/build.gradle

+6-8
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,23 @@ android {
1010
defaultConfig {
1111
minSdkVersion rootProject.ext.minSdkVersion
1212
targetSdkVersion rootProject.ext.targetSdkVersion
13-
versionCode 1
14-
versionName "1.0"
15-
1613
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
17-
18-
}
19-
20-
packagingOptions {
21-
exclude "**/BuildConfig.class"
2214
}
2315

2416
lintOptions {
2517
abortOnError false
2618
}
2719

2820
buildTypes {
21+
debug {
22+
testCoverageEnabled = true
23+
buildConfigField("String","PARSE_VERSION","\"${version}\"")
24+
}
2925
release {
3026
minifyEnabled false
27+
testCoverageEnabled = false
3128
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
29+
buildConfigField("String","PARSE_VERSION","\"${version}\"")
3230
}
3331
}
3432

0 commit comments

Comments
 (0)