Skip to content

Commit 2c5c9ec

Browse files
committed
Fix builds for the Play Store
1 parent 6b9e925 commit 2c5c9ec

14 files changed

+44
-13
lines changed

sample/build.gradle

+24-1
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,39 @@ android {
5252
minSdkVersion Integer.parseInt(MIN_SDK_SAMPLE)
5353
}
5454

55+
signingConfigs {
56+
release {
57+
storeFile file(project.hasProperty("SHOWCASEVIEW_KEYSTORE_LOCATION") ? SHOWCASEVIEW_KEYSTORE_LOCATION : "/Users/amlcurran/.android/debug.keystore")
58+
storePassword returnDefault("SHOWCASEVIEW_KEYSTORE_PW")
59+
keyAlias returnDefault("SHOWCASEVIEW_KEY_ALIAS")
60+
keyPassword returnDefault("SHOWCASEVIEW_KEY_PW")
61+
}
62+
}
63+
5564
lintOptions {
5665
abortOnError false
5766
}
67+
68+
buildTypes {
69+
release {
70+
signingConfig signingConfigs.release
71+
}
72+
}
73+
}
74+
75+
def returnDefault(String propertyName) {
76+
if (project.hasProperty(propertyName)) {
77+
return project.property(propertyName)
78+
} else {
79+
return ""
80+
}
5881
}
5982

6083
def parseVersionName() {
6184
if (project.hasProperty('versionName')) {
6285
return versionName
6386
} else {
6487
println("No version name supplied, using default")
65-
return "0"
88+
return "5.4.0"
6689
}
6790
}

sample/src/main/AndroidManifest.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
-->
1717

1818
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
19-
package="com.github.amlcurran.showcaseview.sample">
19+
package="com.espian.showcaseview.sample">
2020

2121
<application
2222
android:label="@string/app_name"
@@ -25,7 +25,7 @@
2525
android:allowBackup="true">
2626

2727
<activity
28-
android:name=".MainActivity"
28+
android:name="com.github.amlcurran.showcaseview.sample.MainActivity"
2929
android:label="@string/app_name"
3030
android:logo="@drawable/ic_logo">
3131
<intent-filter>
@@ -34,21 +34,21 @@
3434
</intent-filter>
3535
</activity>
3636

37-
<activity android:name=".animations.AnimationSampleActivity" />
37+
<activity android:name="com.github.amlcurran.showcaseview.sample.animations.AnimationSampleActivity" />
3838

39-
<activity android:name=".MemoryManagementTesting" />
39+
<activity android:name="com.github.amlcurran.showcaseview.sample.MemoryManagementTesting" />
4040

41-
<activity android:name=".SingleShotActivity" />
41+
<activity android:name="com.github.amlcurran.showcaseview.sample.SingleShotActivity" />
4242

43-
<activity android:name=".CustomTextActivity" />
43+
<activity android:name="com.github.amlcurran.showcaseview.sample.CustomTextActivity" />
4444

45-
<activity android:name=".CustomShowcaseActivity" />
45+
<activity android:name="com.github.amlcurran.showcaseview.sample.CustomShowcaseActivity" />
4646

47-
<activity android:name=".ActionItemsSampleActivity" />
47+
<activity android:name="com.github.amlcurran.showcaseview.sample.ActionItemsSampleActivity" />
4848

49-
<activity android:name=".EventsActivity" />
49+
<activity android:name="com.github.amlcurran.showcaseview.sample.EventsActivity" />
5050

51-
<activity android:name=".FragmentDemoActivity" />
51+
<activity android:name="com.github.amlcurran.showcaseview.sample.FragmentDemoActivity" />
5252

5353
</application>
5454
</manifest>

sample/src/main/java/com/github/amlcurran/showcaseview/sample/ActionItemsSampleActivity.java

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import android.support.v7.widget.Toolbar;
77
import android.view.Menu;
88

9+
import com.espian.showcaseview.sample.R;
910
import com.github.amlcurran.showcaseview.ShowcaseView;
1011

1112
public class ActionItemsSampleActivity extends AppCompatActivity {

sample/src/main/java/com/github/amlcurran/showcaseview/sample/CustomShowcaseActivity.java

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import android.graphics.RectF;
1111
import android.os.Bundle;
1212

13+
import com.espian.showcaseview.sample.R;
1314
import com.github.amlcurran.showcaseview.ShowcaseDrawer;
1415
import com.github.amlcurran.showcaseview.ShowcaseView;
1516
import com.github.amlcurran.showcaseview.targets.ViewTarget;

sample/src/main/java/com/github/amlcurran/showcaseview/sample/CustomTextActivity.java

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import android.text.Layout;
88
import android.text.TextPaint;
99

10+
import com.espian.showcaseview.sample.R;
1011
import com.github.amlcurran.showcaseview.ShowcaseView;
1112
import com.github.amlcurran.showcaseview.targets.ViewTarget;
1213

sample/src/main/java/com/github/amlcurran/showcaseview/sample/EventsActivity.java

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import android.widget.Button;
1111
import android.widget.TextView;
1212

13+
import com.espian.showcaseview.sample.R;
1314
import com.github.amlcurran.showcaseview.OnShowcaseEventListener;
1415
import com.github.amlcurran.showcaseview.ShowcaseView;
1516
import com.github.amlcurran.showcaseview.SimpleShowcaseEventListener;

sample/src/main/java/com/github/amlcurran/showcaseview/sample/FragmentDemoActivity.java

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import android.view.ViewGroup;
1010
import android.widget.Button;
1111

12+
import com.espian.showcaseview.sample.R;
1213
import com.github.amlcurran.showcaseview.ShowcaseView;
1314
import com.github.amlcurran.showcaseview.SimpleShowcaseEventListener;
1415
import com.github.amlcurran.showcaseview.targets.ViewTarget;

sample/src/main/java/com/github/amlcurran/showcaseview/sample/MainActivity.java

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import android.widget.RelativeLayout;
3636
import android.widget.TextView;
3737

38+
import com.espian.showcaseview.sample.R;
3839
import com.github.amlcurran.showcaseview.OnShowcaseEventListener;
3940
import com.github.amlcurran.showcaseview.ShowcaseView;
4041
import com.github.amlcurran.showcaseview.sample.animations.AnimationSampleActivity;

sample/src/main/java/com/github/amlcurran/showcaseview/sample/MemoryManagementTesting.java

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import android.app.Activity;
2020
import android.os.Bundle;
2121

22+
import com.espian.showcaseview.sample.R;
2223
import com.github.amlcurran.showcaseview.ShowcaseView;
2324
import com.github.amlcurran.showcaseview.SimpleShowcaseEventListener;
2425
import com.github.amlcurran.showcaseview.targets.ViewTarget;

sample/src/main/java/com/github/amlcurran/showcaseview/sample/SingleShotActivity.java

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import android.app.Activity;
2020
import android.os.Bundle;
2121

22+
import com.espian.showcaseview.sample.R;
2223
import com.github.amlcurran.showcaseview.ShowcaseView;
2324
import com.github.amlcurran.showcaseview.targets.Target;
2425
import com.github.amlcurran.showcaseview.targets.ViewTarget;

sample/src/main/java/com/github/amlcurran/showcaseview/sample/animations/AnimationSampleActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import android.view.View;
2323
import android.widget.TextView;
2424

25+
import com.espian.showcaseview.sample.R;
2526
import com.github.amlcurran.showcaseview.ShowcaseView;
26-
import com.github.amlcurran.showcaseview.sample.R;
2727
import com.github.amlcurran.showcaseview.targets.Target;
2828
import com.github.amlcurran.showcaseview.targets.ViewTarget;
2929

sample/src/main/java/com/github/amlcurran/showcaseview/sample/legacy/MultipleShowcaseSampleActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import android.view.View;
2525
import android.widget.Toast;
2626

27-
import com.github.amlcurran.showcaseview.sample.R;
27+
import com.espian.showcaseview.sample.R;
2828

2929
public class MultipleShowcaseSampleActivity extends Activity {
3030

showcaseview_playstore_promo.png

332 KB
Loading

showcaseview_playstore_promo.xcf

1.4 MB
Binary file not shown.

0 commit comments

Comments
 (0)