Merge pull request #80 from ivpn/GAA-34

AlexKorvin · web-flow · commit ff7569309b56 · 2021-07-24T11:09:54.000+03:00
Update build versions for all submodules
diff --git a/.gitignore b/.gitignore
@@ -12,5 +12,4 @@ keystore.properties
 /keystore.properties
 /.idea/
 /core/.cxx/
-/.idea/
 core/.cxx/
diff --git a/fdroid/build.gradle b/fdroid/build.gradle
@@ -29,8 +29,8 @@ android {
         applicationId "net.ivpn.client"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 90
-        versionName "2.4.0"
+        versionCode 100
+        versionName "2.6.0"
 
         manifestPlaceholders = [SENTRY_DSN: keystoreProperties['sentry.dsn']]
         buildConfigField "String", "BILLING_PUBLIC_KEY", keystoreProperties['billing.public.key']
diff --git a/site/build.gradle b/site/build.gradle
@@ -29,8 +29,8 @@ android {
         applicationId "net.ivpn.client"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 90
-        versionName "2.4.0"
+        versionCode 100
+        versionName "2.6.0"
 
         manifestPlaceholders = [SENTRY_DSN: keystoreProperties['sentry.dsn']]
         buildConfigField "String", "BILLING_PUBLIC_KEY", keystoreProperties['billing.public.key']
diff --git a/store/src/main/java/net/ivpn/client/signup/SignUpViewModel.kt b/store/src/main/java/net/ivpn/client/signup/SignUpViewModel.kt
@@ -69,7 +69,6 @@ class SignUpViewModel @Inject constructor(
 
     val selectedPeriod = ObservableField<Period?>()
     val selectedPlan = ObservableField<Plan>()
-//    val dataLoading = ObservableBoolean()
 
     val oneWeek = ObservableField<SkuDetails>()
     val oneMonth = ObservableField<SkuDetails>()
