Pārlūkot izejas kodu

Merge commit 'refs/tags/jenkins-front-end-screenad-12^{}' into release

tags/jenkins-front-end-screenad-104-v1
hupeng pirms 6 gadiem
vecāks
revīzija
c2e07a413d
5 mainītis faili ar 28 papildinājumiem un 6 dzēšanām
  1. +25
    -2
      android/app/build.gradle
  2. +2
    -2
      android/app/src/main/java/com/screenad/MainApplication.java
  3. +0
    -1
      android/app/src/main/res/values/strings.xml
  4. Binārs
      android/gradle/wrapper/gradle-4.7-all.zip
  5. +1
    -1
      android/gradle/wrapper/gradle-wrapper.properties

+ 25
- 2
android/app/build.gradle Parādīt failu

@@ -98,13 +98,28 @@ android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion

def getVersionCode = { ->
return project.hasProperty('versionCode') ? Integer.parseInt(project.versionCode) : 1
}

def getVersionName = { ->
return project.hasProperty('versionName') ? project.versionName : "1.0"
}

defaultConfig {
applicationId "com.screenad"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
versionCode = getVersionCode()
versionName getVersionName()
}

android.applicationVariants.all { variant ->
variant.outputs.all {
outputFileName = "screenad_" + variant.buildType.name + "_v" + defaultConfig.versionName + ".apk"
}
}

splits {
abi {
reset()
@@ -114,7 +129,15 @@ android {
}
}
buildTypes {
debug {
buildConfigField "String", "API_HOST", "\"https://mall.youlane.cn/\""
buildConfigField "String", "CODEPUSH_HOST", "\"http://202.165.179.86:3333/\""
buildConfigField "String", "CODEPUSH_KEY", "\"8snO1yoHlvhEtBjr02zTr3g1comw4ksvOXqog\""
}
release {
buildConfigField "String", "API_HOST", "\"https://admin.malls.iformall.com/\""
buildConfigField "String", "CODEPUSH_HOST", "\"http://202.165.179.86:3333/\""
buildConfigField "String", "CODEPUSH_KEY", "\"9rYZYySFD0ryN5wCD9YmjJkT55Kf4ksvOXqog\""
minifyEnabled enableProguardInReleaseBuilds
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
}


+ 2
- 2
android/app/src/main/java/com/screenad/MainApplication.java Parādīt failu

@@ -31,10 +31,10 @@ public class MainApplication extends Application implements ReactApplication {
return Arrays.<ReactPackage>asList(
new MainReactPackage(),
new CodePush(
getResources().getString(R.string.reactNativeCodePush_androidDeploymentKey),
BuildConfig.CODEPUSH_KEY,
getApplicationContext(),
BuildConfig.DEBUG,
"http://202.165.179.86:3333/"
BuildConfig.CODEPUSH_HOST
)
);
}


+ 0
- 1
android/app/src/main/res/values/strings.xml Parādīt failu

@@ -1,4 +1,3 @@
<resources>
<string moduleConfig="true" name="reactNativeCodePush_androidDeploymentKey">9rYZYySFD0ryN5wCD9YmjJkT55Kf4ksvOXqog</string>
<string name="app_name">screenAd</string>
</resources>

Binārs
android/gradle/wrapper/gradle-4.7-all.zip Parādīt failu


+ 1
- 1
android/gradle/wrapper/gradle-wrapper.properties Parādīt failu

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
distributionUrl=gradle-4.7-all.zip

Notiek ielāde…
Atcelt
Saglabāt